mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From f7eda9338b67b376df9a1d42b9533035dde4bf80 Mon Sep 17 00:00:00 2001
|
|
From: James Bottomley <jbottomley@parallels.com>
|
|
Date: Wed, 30 May 2012 09:45:39 +0000
|
|
Subject: [PATCH 33/86] fix scsi_wait_scan
|
|
|
|
commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.
|
|
|
|
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.
|
|
|
|
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/scsi/scsi_wait_scan.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c
|
|
index 74708fc..ae78148 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)
|
|
{
|
|
--
|
|
1.7.9.5
|
|
|