From 1e1f50e50f67f7e41f72e0381502adf25971a318 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 12 Feb 2010 12:13:31 -0500 Subject: [PATCH] --- yaml --- r: 181382 b: refs/heads/master c: 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_scan.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b449a0471dbd..ed61f4b58b90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 277e76f1821ab131a409c6a2e04492ef5774fb3c +refs/heads/master: 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c index 012f73a96880..60b262d66b5b 100644 --- a/trunk/drivers/scsi/scsi_scan.c +++ b/trunk/drivers/scsi/scsi_scan.c @@ -1339,8 +1339,10 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, sdev = scsi_alloc_sdev(starget, 0, NULL); if (!sdev) return 0; - if (scsi_device_get(sdev)) + if (scsi_device_get(sdev)) { + __scsi_remove_device(sdev); return 0; + } } sprintf(devname, "host %d channel %d id %d",