adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Staging: w35und: more simplify hal_init_hardware() error handling

Browse source 
Impact: fix, cleanup

If initialization in hal_init_hardware() fails, we call hal_halt() to
clean up and release resource. However, hal_halt() will attempt to
call del_timer_sync() on ->LEDTimer on "stage 3" although it's not
initialized at that point. Fix that up by simplifying error handling
logic in hal_init_hardware() with gotos.

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:14:00 +03:00 committed by Greg Kroah-Hartman
parent 00e2e05dd0
commit a39ee67174
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/winbond/wbusb.c
View file

@ -488,15 +488,15 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
pHwData->InitialResource = 1;
if (!Wb35Reg_initial(pHwData))
goto error;
goto error_reg_destroy;
pHwData->InitialResource = 2;
if (!Wb35Tx_initial(pHwData))
goto error;
goto error_tx_destroy;
pHwData->InitialResource = 3;
if (!Wb35Rx_initial(pHwData))
goto error;
goto error_rx_destroy;
pHwData->InitialResource = 4;
init_timer(&pHwData->LEDTimer);
@ -522,7 +522,13 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
return 0;
error:
error_rx_destroy:
Wb35Rx_destroy(pHwData);
error_tx_destroy:
Wb35Tx_destroy(pHwData);
error_reg_destroy:
Wb35Reg_destroy(pHwData);
pHwData->SurpriseRemove = 1;
return -EINVAL;
}
@ -617,11 +623,8 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
hal_driver_init_OK(pHwData) = 1; // Notify hal that the driver is ready now.
//set a tx power for reference.....
// sme_set_tx_power_level(priv, 12); FIXME?
return 0;
error:
hal_halt(pHwData, NULL);
return err;
}