From 5105f49793e9d3c42ed0de70fb86c89f1065a4de Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 12 Feb 2010 12:13:39 -0500 Subject: [PATCH] --- yaml --- r: 181383 b: refs/heads/master c: d5469119f0098881ab7f991990ef4f81ef13a194 h: refs/heads/master i: 181381: a191f10810951bd6e7e745401d6a73a561107009 181379: a5ac64be27b7a639320c8c56ab48d421774f35e1 181375: c49625dcb74aa803581233a48c05f5b96d4b3492 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_scan.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ed61f4b58b90..08885c5ce6c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 +refs/heads/master: d5469119f0098881ab7f991990ef4f81ef13a194 diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c index 60b262d66b5b..f697229ae5a9 100644 --- a/trunk/drivers/scsi/scsi_scan.c +++ b/trunk/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: