diff options
| author | James Bottomley <James.Bottomley@steeleye.com> | 2006-09-06 16:00:29 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-09-07 17:37:22 +0200 |
| commit | f479ab87936563a286b8aa0e39003c40fa31c6da (patch) | |
| tree | 9592ef7ca7b68dd2ec5c21e371a6b4ad76be8ac5 /drivers/scsi/scsi.c | |
| parent | [SCSI] Fix refcount breakage with 'echo "1" > scan' when target already present (diff) | |
| download | linux-f479ab87936563a286b8aa0e39003c40fa31c6da.tar.xz linux-f479ab87936563a286b8aa0e39003c40fa31c6da.zip | |
[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>
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index eedfd059b82b..c35f5fc0d668 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -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); |