diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-03-14 04:06:06 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-03-23 11:36:43 -0500 |
| commit | 12a18bdc27f81ba9d0a08a2462a49d339fff8b2d (patch) | |
| tree | 1716220b96063beee30742468afd5922c71f5998 | |
| parent | 872105689eeccbcd77377d6a29f69bba3b0cbe3b (diff) | |
| download | op-kernel-dev-12a18bdc27f81ba9d0a08a2462a49d339fff8b2d.zip op-kernel-dev-12a18bdc27f81ba9d0a08a2462a49d339fff8b2d.tar.gz | |
[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>
| -rw-r--r-- | drivers/target/target_core_transport.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 67d4286..bf6aa8a 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -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); @@ -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); |
