From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Tue, 13 Dec 2005 04:03:30 +0000 (-0500)
Subject: sbp2: did not clean up after scsi_add_device() failed
X-Git-Tag: v2.6.16.28-rc1~1833^2~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac;p=karo-tx-linux.git

sbp2: did not clean up after scsi_add_device() failed

If scsi_add_device() at the end of sbp2_start_device() fails, e.g. due to
transport errors during SCSI inquiry, sbp2 needs to log out of the device
and release all associated resources.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
---

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 372a7726063c..5b9d03e93514 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -960,6 +960,8 @@ alloc_fail:
 	error = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0);
 	if (error) {
 		SBP2_ERR("scsi_add_device failed");
+		sbp2_logout_device(scsi_id);
+		sbp2_remove_device(scsi_id);
 		return error;
 	}