summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-02-12 12:13:39 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-02-18 10:52:39 -0600
commitd5469119f0098881ab7f991990ef4f81ef13a194 (patch)
tree62ffe8444a7692a222b59dc115c30b9047687e57 /drivers/scsi/scsi_scan.c
parent75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 (diff)
downloadop-kernel-dev-d5469119f0098881ab7f991990ef4f81ef13a194.zip
op-kernel-dev-d5469119f0098881ab7f991990ef4f81ef13a194.tar.gz
[SCSI] fix refcounting bug in scsi_get_host_dev
This patch (as1334) fixes a bug in scsi_get_host_dev(). It incorrectly calls get_device() on the new device's target. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 60b262d..f697229 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1909,10 +1909,9 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
goto out;
sdev = scsi_alloc_sdev(starget, 0, NULL);
- if (sdev) {
- sdev->sdev_gendev.parent = get_device(&starget->dev);
+ if (sdev)
sdev->borken = 0;
- } else
+ else
scsi_target_reap(starget);
put_device(&starget->dev);
out:
OpenPOWER on IntegriCloud