staging: vt6656: add error code handling to unused variable
PATCH v2 1/1 staging: vt6656: add error code handling to unused variable
Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within vnt_radio_power_on.
Issue reported by coccinelle (coccicheck).
Suggested-by Quentin Deslandes <[email protected]>
Suggested-by Stefano Brivio <[email protected]>
Signed-off-by John B. Wyatt IV <[email protected]>
---
v2: Replace goto statements with return.
Remove last if check because it was unneeded.
Suggested-by Julia Lawall <[email protected]>
drivers/staging/vt6656/card.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/staging/vt6656/card.c +14 -5
@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ; -vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) + goto end; -vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); +if (ret) + goto end;switch (priv->rf_type) {case RF_AL2230 :
@@ -734,13 +738,18 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :case RF_VT3342A0 : -vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 )); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , + (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 ));break ; } +if (ret) + goto end; -vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); + ret =vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); +if (ret) + goto end; +end:return ret; }
Signature · 1 line
2.25.1
Ignore this one. John sent it by mistake and has already sent a v3.
regards,
dan carpenter