diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-04-08 04:13:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:37 -0400 |
commit | cfe31f81e1ba7e0c590fc1f2fd688309b685654a (patch) | |
tree | 6e1e026ef3d251c433b756b40dd7333253c236ff /drivers | |
parent | 80767e6e1e545b5cd7e7c6962fe0e06589d48ae2 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/winbond/wbusb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index e91d611ad95..897ac94f63a 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c | |||
@@ -476,7 +476,7 @@ static void hal_led_control(unsigned long data) | |||
476 | add_timer(&pHwData->LEDTimer); | 476 | add_timer(&pHwData->LEDTimer); |
477 | } | 477 | } |
478 | 478 | ||
479 | static u8 hal_init_hardware(struct ieee80211_hw *hw) | 479 | static int hal_init_hardware(struct ieee80211_hw *hw) |
480 | { | 480 | { |
481 | struct wbsoft_priv *priv = hw->priv; | 481 | struct wbsoft_priv *priv = hw->priv; |
482 | struct hw_data * pHwData = &priv->sHwData; | 482 | struct hw_data * pHwData = &priv->sHwData; |
@@ -514,13 +514,13 @@ static u8 hal_init_hardware(struct ieee80211_hw *hw) | |||
514 | Wb35Rx_start(hw); | 514 | Wb35Rx_start(hw); |
515 | Wb35Tx_EP2VM_start(priv); | 515 | Wb35Tx_EP2VM_start(priv); |
516 | 516 | ||
517 | return true; | 517 | return 0; |
518 | } | 518 | } |
519 | } | 519 | } |
520 | } | 520 | } |
521 | 521 | ||
522 | pHwData->SurpriseRemove = 1; | 522 | pHwData->SurpriseRemove = 1; |
523 | return false; | 523 | return -EINVAL; |
524 | } | 524 | } |
525 | 525 | ||
526 | static int wb35_hw_init(struct ieee80211_hw *hw) | 526 | static int wb35_hw_init(struct ieee80211_hw *hw) |
@@ -555,10 +555,9 @@ static int wb35_hw_init(struct ieee80211_hw *hw) | |||
555 | 555 | ||
556 | // Initial USB hal | 556 | // Initial USB hal |
557 | pHwData = &priv->sHwData; | 557 | pHwData = &priv->sHwData; |
558 | if (!hal_init_hardware(hw)) { | 558 | err = hal_init_hardware(hw); |
559 | err = -EINVAL; | 559 | if (err) |
560 | goto error; | 560 | goto error; |
561 | } | ||
562 | 561 | ||
563 | EEPROM_region = hal_get_region_from_EEPROM( pHwData ); | 562 | EEPROM_region = hal_get_region_from_EEPROM( pHwData ); |
564 | if (EEPROM_region != REGION_AUTO) | 563 | if (EEPROM_region != REGION_AUTO) |