OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: w35und: simplify error handling in wb35_hw_init() 

Impact: cleanup

Change hal_init_hardware() to return an error code rather than a boolean
to simplify error handling in wb35_hw_init().

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2009-04-08 11:13:58 +03:00 committed by Greg Kroah-Hartman
parent 80767e6e1e
commit cfe31f81e1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/winbond/wbusb.c
View File

@ -476,7 +476,7 @@ static void hal_led_control(unsigned long data)
add_timer(&pHwData->LEDTimer);
}
static u8 hal_init_hardware(struct ieee80211_hw *hw)
static int hal_init_hardware(struct ieee80211_hw *hw)
{
struct wbsoft_priv *priv = hw->priv;
struct hw_data * pHwData = &priv->sHwData;
@ -514,13 +514,13 @@ static u8 hal_init_hardware(struct ieee80211_hw *hw)
Wb35Rx_start(hw);
Wb35Tx_EP2VM_start(priv);
return true;
return 0;
}
}
}
pHwData->SurpriseRemove = 1;
return false;
return -EINVAL;
}
static int wb35_hw_init(struct ieee80211_hw *hw)
@ -555,10 +555,9 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
// Initial USB hal
pHwData = &priv->sHwData;
if (!hal_init_hardware(hw)) {
err = -EINVAL;
err = hal_init_hardware(hw);
if (err)
goto error;
}
EEPROM_region = hal_get_region_from_EEPROM( pHwData );
if (EEPROM_region != REGION_AUTO)