From 7b29ed6ea952db9cf29e66155be0acab0d2ed863 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Thu, 15 Sep 2005 21:52:51 -0400
Subject: [PATCH] --- yaml --- r: 9097 b: refs/heads/master c:
 541950027f8b7c96a639bc16e48930c590f1b98a h: refs/heads/master i:   9095:
 b017db08fbb403b0214343b0d09a26e260ad00d7 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_sysfs.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6230c08110c0..e38ce397e208 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5683557331b129658ab435391df527ef72d63dc
+refs/heads/master: 541950027f8b7c96a639bc16e48930c590f1b98a
diff --git a/trunk/drivers/scsi/scsi_sysfs.c b/trunk/drivers/scsi/scsi_sysfs.c
index b8052d5206cc..83f87c41b18d 100644
--- a/trunk/drivers/scsi/scsi_sysfs.c
+++ b/trunk/drivers/scsi/scsi_sysfs.c
@@ -707,9 +707,11 @@ void __scsi_remove_device(struct scsi_device *sdev)
  **/
 void scsi_remove_device(struct scsi_device *sdev)
 {
-	down(&sdev->host->scan_mutex);
+	struct Scsi_Host *shost = sdev->host;
+
+	down(&shost->scan_mutex);
 	__scsi_remove_device(sdev);
-	up(&sdev->host->scan_mutex);
+	up(&shost->scan_mutex);
 }
 EXPORT_SYMBOL(scsi_remove_device);