Commit 12a18bdc authored Mar 14, 2011 by Nicholas Bellinger Committed by James Bottomley Mar 23, 2011

[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>

parent 87210568

drivers/target/target_core_transport.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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);

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

		spin_lock(&hba->device_lock);