From 6b1beb7441b0fa6c30ac0467ae790fedfcf79a80 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Thu, 13 Sep 2012 15:00:54 +0530 Subject: [PATCH] --- yaml --- r: 325269 b: refs/heads/master c: 675be12f45f3f90ed22949fe08ad164316f75316 h: refs/heads/master i: 325267: fdeed29a39659d771eec8d61f8e5c03d9169bba4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/hfa384x_usb.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 6d3fdd3d15c8..4b3ed722d691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f45932720b7d4e1d409b3cc5cbc0bf18d67553b +refs/heads/master: 675be12f45f3f90ed22949fe08ad164316f75316 diff --git a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c index bdc63a61c663..f180c3d8b012 100644 --- a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c @@ -4045,23 +4045,20 @@ static void hfa384x_usb_throttlefn(unsigned long data) static int hfa384x_usbctlx_submit(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx) { unsigned long flags; - int ret; spin_lock_irqsave(&hw->ctlxq.lock, flags); if (hw->wlandev->hwremoved) { spin_unlock_irqrestore(&hw->ctlxq.lock, flags); - ret = -ENODEV; - } else { - ctlx->state = CTLX_PENDING; - list_add_tail(&ctlx->list, &hw->ctlxq.pending); - - spin_unlock_irqrestore(&hw->ctlxq.lock, flags); - hfa384x_usbctlxq_run(hw); - ret = 0; + return -ENODEV; } - return ret; + ctlx->state = CTLX_PENDING; + list_add_tail(&ctlx->list, &hw->ctlxq.pending); + spin_unlock_irqrestore(&hw->ctlxq.lock, flags); + hfa384x_usbctlxq_run(hw); + + return 0; } /*----------------------------------------------------------------