From d525802909c7aea209e4d93c0458f014c335ee42 Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Mon, 14 Mar 2011 04:06:06 -0700 Subject: [PATCH] --- yaml --- r: 242691 b: refs/heads/master c: 12a18bdc27f81ba9d0a08a2462a49d339fff8b2d h: refs/heads/master i: 242689: 699b9781462bb644b0e3ad39b166912d9d107b18 242687: ad87400f1f2d361a5eca9370c4da3aa6495d5a1b v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_transport.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 06966ad80e93..90b2e172f5b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 872105689eeccbcd77377d6a29f69bba3b0cbe3b +refs/heads/master: 12a18bdc27f81ba9d0a08a2462a49d339fff8b2d diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c index 67d4286cf244..bf6aa8a9f1d8 100644 --- a/trunk/drivers/target/target_core_transport.c +++ b/trunk/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);