diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-17 07:32:08 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-17 07:32:08 -0800 |
| commit | ed94724bedcbc40cbfc12d16990e834d64220d3f (patch) | |
| tree | f69f66e8c2c4402cdfb739d86d1ca6e63653eead | |
| parent | ses: fix additional element traversal bug (diff) | |
| parent | Revert "SCSI: Fix NULL pointer dereference in runtime PM" (diff) | |
| download | linux-dev-ed94724bedcbc40cbfc12d16990e834d64220d3f.tar.xz linux-dev-ed94724bedcbc40cbfc12d16990e834d64220d3f.zip | |
Merge remote-tracking branch 'mkp-scsi/4.4/scsi-fixes' into fixes
Diffstat (limited to '')
| -rw-r--r-- | drivers/scsi/scsi_pm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index e4b799837948..459abe1dcc87 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -219,13 +219,13 @@ static int sdev_runtime_suspend(struct device *dev) struct scsi_device *sdev = to_scsi_device(dev); int err = 0; - if (pm && pm->runtime_suspend) { - err = blk_pre_runtime_suspend(sdev->request_queue); - if (err) - return err; + err = blk_pre_runtime_suspend(sdev->request_queue); + if (err) + return err; + if (pm && pm->runtime_suspend) err = pm->runtime_suspend(dev); - blk_post_runtime_suspend(sdev->request_queue, err); - } + blk_post_runtime_suspend(sdev->request_queue, err); + return err; } @@ -248,11 +248,11 @@ static int sdev_runtime_resume(struct device *dev) const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; int err = 0; - if (pm && pm->runtime_resume) { - blk_pre_runtime_resume(sdev->request_queue); + blk_pre_runtime_resume(sdev->request_queue); + if (pm && pm->runtime_resume) err = pm->runtime_resume(dev); - blk_post_runtime_resume(sdev->request_queue, err); - } + blk_post_runtime_resume(sdev->request_queue, err); + return err; } |