From f5949b8f07f297f23b30e41f43b65e6f3fd43329 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@mvista.com>
Date: Sat, 9 Sep 2006 09:31:03 -0700
Subject: [PATCH] --- yaml --- r: 35047 b: refs/heads/master c:
 a506b44bb5000b2652490a906c3e58beb2a8f6bb h: refs/heads/master i:   35045:
 6de47ac6c580ba597ee12a8b7ba4950f0fb06f91   35043:
 2eacc47204df7cb9413e1bbff389f8c4f4358267   35039:
 db61f26f95accf6b71c6e210d7ca50bbe8e72ecd v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/scsi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cbd92162cec5..9ad8acd940c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b7cbe20174695bca1afe2a8f755e1eb299f4768
+refs/heads/master: a506b44bb5000b2652490a906c3e58beb2a8f6bb
diff --git a/trunk/drivers/scsi/scsi.c b/trunk/drivers/scsi/scsi.c
index c35f5fc0d668..c51b5769eac8 100644
--- a/trunk/drivers/scsi/scsi.c
+++ b/trunk/drivers/scsi/scsi.c
@@ -875,10 +875,12 @@ void scsi_device_put(struct scsi_device *sdev)
 {
 	struct module *module = sdev->host->hostt->module;
 
+#ifdef CONFIG_MODULE_UNLOAD
 	/* The module refcount will be zero if scsi_device_get()
 	 * was called from a module removal routine */
 	if (module && module_refcount(module) != 0)
 		module_put(module);
+#endif
 	put_device(&sdev->sdev_gendev);
 }
 EXPORT_SYMBOL(scsi_device_put);