Skip to content

Commit

Permalink
[SCSI] target: Fix bogus return in transport_add_device_to_core_hba f…
Browse files Browse the repository at this point in the history
…ailure 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>
  • Loading branch information
Nicholas Bellinger authored and James Bottomley committed Mar 23, 2011
1 parent 8721056 commit 12a18bd
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ struct se_device *transport_add_device_to_core_hba(
const char *inquiry_prod,
const char *inquiry_rev)
{
int ret = 0, force_pt;
int force_pt;
struct se_device *dev;

dev = kzalloc(sizeof(struct se_device), GFP_KERNEL);
Expand Down Expand Up @@ -1737,9 +1737,8 @@ struct se_device *transport_add_device_to_core_hba(
}
scsi_dump_inquiry(dev);

return dev;
out:
if (!ret)
return dev;
kthread_stop(dev->process_thread);

spin_lock(&hba->device_lock);
Expand Down

0 comments on commit 12a18bd

Please sign in to comment.