dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[SCSI] fix up non-modular SCSI 

The recent change to the way scsi_device_get()/put() work broke the
non modular build (we do a module_refcount on a NULL).  Fix this by
checking for non-null before checking module_refcount().

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley 2006-09-06 09:00:29 -05:00 committed by James Bottomley
parent 884d25cc4f
commit f479ab8793
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/scsi.c
View File

@ -873,10 +873,12 @@ EXPORT_SYMBOL(scsi_device_get);
*/
void scsi_device_put(struct scsi_device *sdev)
{
struct module *module = sdev->host->hostt->module;
/* The module refcount will be zero if scsi_device_get()
* was called from a module removal routine */
if (likely(module_refcount(sdev->host->hostt->module) != 0))
module_put(sdev->host->hostt->module);
if (module && module_refcount(module) != 0)
module_put(module);
put_device(&sdev->sdev_gendev);
}
EXPORT_SYMBOL(scsi_device_put);