diff options
| author | Arend van Spriel <arend@broadcom.com> | 2013-04-23 12:53:14 +0200 | 
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-23 14:17:03 -0400 | 
| commit | a786b38d542f62e19ffa8adbcbfc82065cd13a11 (patch) | |
| tree | f4861959293722f2bb977a6ce148a42a2370575b /drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |
| parent | 9a83f1ec670fa574ffbfa9fb1f3fdaa9c6be5974 (diff) | |
| download | olio-linux-3.10-a786b38d542f62e19ffa8adbcbfc82065cd13a11.tar.xz olio-linux-3.10-a786b38d542f62e19ffa8adbcbfc82065cd13a11.zip  | |
brcmfmac: correct error handling in brcmf_fws_init()
In brcmf_fws_init() the error flows were not properly handled
and the caller ignored the return value. The only action that
is allowed to fail in brcmf_fws_init() is setting the tlv in
firmware as the feature is not supported on all devices.
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index a0afef26ac1..59c25463e42 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -899,7 +899,10 @@ int brcmf_bus_start(struct device *dev)  		goto fail;  	drvr->fw_signals = true; -	(void)brcmf_fws_init(drvr); +	ret = brcmf_fws_init(drvr); +	if (ret < 0) +		goto fail; +  	brcmf_fws_add_interface(ifp);  	drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev);  |