---

yaml --- r: 8731 b: refs/heads/master c: b70d37b h: refs/heads/master i: 8729: 7ced3db 8727: 657326b v: v3
git-mirror · Sep 10, 2005 · 66e0923 · 66e0923
1 parent a6c91f1
commit 66e0923
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f631b4be76355dc3bf49563c706a9fb938993bde
+refs/heads/master: b70d37bf61f278f9d9adf17c52af6b2d0ae7800c
diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c
@@ -870,8 +870,12 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
  out_free_sdev:
 	if (res == SCSI_SCAN_LUN_PRESENT) {
 		if (sdevp) {
-			scsi_device_get(sdev);
-			*sdevp = sdev;
+			if (scsi_device_get(sdev) == 0) {
+				*sdevp = sdev;
+			} else {
+				__scsi_remove_device(sdev);
+				res = SCSI_SCAN_NO_RESPONSE;
+			}
 		}
 	} else {
 		if (sdev->host->hostt->slave_destroy)