unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

Staging: w35und: simplify hal_init_hardware() error handling

Browse source 
Impact: cleanup

Use gotos to simplify the deep if-statement nesting in
hal_init_hardware().

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

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

@ -487,11 +487,17 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
pHwData->FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; // Setting default fragment threshold
pHwData->InitialResource = 1;
if( Wb35Reg_initial(pHwData)) {
if (!Wb35Reg_initial(pHwData))
goto error;
pHwData->InitialResource = 2;
if (Wb35Tx_initial(pHwData)) {
if (!Wb35Tx_initial(pHwData))
goto error;
pHwData->InitialResource = 3;
if (Wb35Rx_initial(pHwData)) {
if (!Wb35Rx_initial(pHwData))
goto error;
pHwData->InitialResource = 4;
init_timer(&pHwData->LEDTimer);
pHwData->LEDTimer.function = hal_led_control;
@ -515,10 +521,8 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
Wb35Tx_EP2VM_start(priv);
return 0;
}
}
}
error:
pHwData->SurpriseRemove = 1;
return -EINVAL;
}