summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 17:23:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 17:23:52 -0700
commitb7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d (patch)
treef5af8945a6b2f7ee2150420450d980cffd8173d4 /drivers/scsi/sd.c
parent7f8730781830cd38438b10d44d17ccb8eafa9265 (diff)
parent3c31b52f96f7b559d950b16113c0f68c72a1985e (diff)
downloadtalos-obmc-linux-b7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d.tar.gz
talos-obmc-linux-b7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d.zip
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
Pull async SCSI resume support from Dan Williams: "Allow disks and other devices to resume in parallel. This provides a tangible speed up for a non-esoteric use case (laptop resume): https://01.org/suspendresume/blogs/tebrandt/2013/hard-disk-resume-optimization-simpler-approach" * 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci: scsi: async sd resume
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 89e6c04ac595..efcbcd182863 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3026,6 +3026,7 @@ static int sd_remove(struct device *dev)
devt = disk_devt(sdkp->disk);
scsi_autopm_get_device(sdkp->device);
+ async_synchronize_full_domain(&scsi_sd_pm_domain);
async_synchronize_full_domain(&scsi_sd_probe_domain);
blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
blk_queue_unprep_rq(sdkp->device->request_queue, NULL);
OpenPOWER on IntegriCloud