brcmfmac: do not load firmware when device is already running
authorArend van Spriel <arend@broadcom.com>
Sun, 25 Jan 2015 19:31:37 +0000 (20:31 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 29 Jan 2015 07:59:07 +0000 (09:59 +0200)
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>
drivers/net/wireless/brcm80211/brcmfmac/usb.c

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