[SCSI] target: Fix bogus return in transport_add_device_to_core_hba failure path

This patch removes a bogus conditional+return check within the failure path
of transport_add_device_to_core_hba().  This breakage was introduced during
the v4 conversion to remove struct se_cmd passthrough ops for INQUIRY /
READ_CAPCITY during struct se_device creation and registration process.

Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Nicholas Bellinger 2011-03-14 04:06:06 -07:00 committed by James Bottomley
parent 872105689e
commit 12a18bdc27

View File

@ -1620,7 +1620,7 @@ struct se_device *transport_add_device_to_core_hba(
const char *inquiry_prod, const char *inquiry_prod,
const char *inquiry_rev) const char *inquiry_rev)
{ {
int ret = 0, force_pt; int force_pt;
struct se_device *dev; struct se_device *dev;
dev = kzalloc(sizeof(struct se_device), GFP_KERNEL); dev = kzalloc(sizeof(struct se_device), GFP_KERNEL);
@ -1737,9 +1737,8 @@ struct se_device *transport_add_device_to_core_hba(
} }
scsi_dump_inquiry(dev); scsi_dump_inquiry(dev);
return dev;
out: out:
if (!ret)
return dev;
kthread_stop(dev->process_thread); kthread_stop(dev->process_thread);
spin_lock(&hba->device_lock); spin_lock(&hba->device_lock);