Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

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;
 }