Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / wlan-ng / hfa384x_usb.c

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index e109a7fd422ffe387f0457c695eb39518472d956..444ebed7313a4320e0b8667b61a1cdda071b178e 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1194,7 +1194,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
 ----------------------------------------------------------------*/
 int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
 {
-       int result = 0;
+       int result;
 
        result = usb_reset_device(hw->usb);
        if (result < 0) {