Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / drivers / scsi / scsi_pm.c

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index d70e91ae60af199d8e64a027fa4382026e553f90..d82a023a90154db7fe9e5a19b70eb738a009988f 100644 (file)
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -144,9 +144,9 @@ int scsi_autopm_get_device(struct scsi_device *sdev)
        int     err;
 
        err = pm_runtime_get_sync(&sdev->sdev_gendev);
-       if (err < 0)
+       if (err < 0 && err !=-EACCES)
                pm_runtime_put_sync(&sdev->sdev_gendev);
-       else if (err > 0)
+       else
                err = 0;
        return err;
 }
@@ -173,9 +173,9 @@ int scsi_autopm_get_host(struct Scsi_Host *shost)
        int     err;
 
        err = pm_runtime_get_sync(&shost->shost_gendev);
-       if (err < 0)
+       if (err < 0 && err !=-EACCES)
                pm_runtime_put_sync(&shost->shost_gendev);
-       else if (err > 0)
+       else
                err = 0;
        return err;
 }