diff options
| author |   James Bottomley <jbottomley@parallels.com> | 2012-05-30 09:45:39 +0000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-30 13:46:37 +0400 |
| commit | 1ff2f40305772b159a91c19590ee159d3a504afc (patch) | |
| tree | 465cf3d91ff97705abc67a93188284fef54670f2 /drivers/scsi | |
| parent | [SCSI] fix async probe regression (diff) | |
| download | linux-dev-1ff2f40305772b159a91c19590ee159d3a504afc.tar.xz linux-dev-1ff2f40305772b159a91c19590ee159d3a504afc.zip | |
[SCSI] fix scsi_wait_scan
Commit c751085943362143f84346d274e0011419c84202
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun Apr 12 20:06:56 2009 +0200
PM/Hibernate: Wait for SCSI devices scan to complete during resume
Broke the scsi_wait_scan module in 2.6.30. Apparently debian still uses it so
fix it and backport to stable before removing it in 3.6.
The breakage is caused because the function template in
include/scsi/scsi_scan.h is defined to be a nop unless SCSI is built in.
That means that in the modular case (which is every distro), the
scsi_wait_scan module does a simple async_synchronize_full() instead of
waiting for scans.
Cc: <stable@vger.kernel.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_wait_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c index 74708fcaf82f..ae7814874618 100644 --- a/drivers/scsi/scsi_wait_scan.c +++ b/drivers/scsi/scsi_wait_scan.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <linux/device.h> -#include <scsi/scsi_scan.h> +#include "scsi_priv.h" static int __init wait_scan_init(void) { |