Browse Source

brcmfmac: do not load firmware when device is already running

In brcmf_usb_probe_cb() the device is checked to determine whether
it is already running firmware. However, when no firmware download
is needed it still continues to request the firmware files. This
is fixed by returning after successful setup.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Arend van Spriel 11 years ago
parent
commit
86fec35e17
1 changed files with 2 additions and 0 deletions
  1. 2 0
      drivers/net/wireless/brcm80211/brcmfmac/usb.c

+ 2 - 0
drivers/net/wireless/brcm80211/brcmfmac/usb.c

@@ -1263,6 +1263,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
 		ret = brcmf_usb_bus_setup(devinfo);
 		ret = brcmf_usb_bus_setup(devinfo);
 		if (ret)
 		if (ret)
 			goto fail;
 			goto fail;
+		/* we are done */
+		return 0;
 	}
 	}
 	bus->chip = bus_pub->devid;
 	bus->chip = bus_pub->devid;
 	bus->chiprev = bus_pub->chiprev;
 	bus->chiprev = bus_pub->chiprev;