---

yaml --- r: 35047 b: refs/heads/master c: a506b44 h: refs/heads/master i: 35045: 6de47ac 35043: 2eacc47 35039: db61f26 v: v3
git-mirror · Sep 12, 2006 · f5949b8 · f5949b8
1 parent 027bfc6
commit f5949b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);