Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

[linux-2.6-block.git] / block / blk-pm.c

diff --git a/block/blk-pm.c b/block/blk-pm.c
index 0a028c1898977c5208223928c3f2d490c4213999..1adc1cd748b4038d8bb441d76fa9ca277d333c0c 100644 (file)
--- a/block/blk-pm.c
+++ b/block/blk-pm.c
@@ -207,10 +207,12 @@ EXPORT_SYMBOL(blk_post_runtime_resume);
  */
 void blk_set_runtime_active(struct request_queue *q)
 {
-       spin_lock_irq(&q->queue_lock);
-       q->rpm_status = RPM_ACTIVE;
-       pm_runtime_mark_last_busy(q->dev);
-       pm_request_autosuspend(q->dev);
-       spin_unlock_irq(&q->queue_lock);
+       if (q->dev) {
+               spin_lock_irq(&q->queue_lock);
+               q->rpm_status = RPM_ACTIVE;
+               pm_runtime_mark_last_busy(q->dev);
+               pm_request_autosuspend(q->dev);
+               spin_unlock_irq(&q->queue_lock);
+       }
 }
 EXPORT_SYMBOL(blk_set_runtime_active);