Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f4a80c authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: usb: call brcmf_usb_up() during brcmf_bus_preinit() 



By calling brcmf_usb_up() during brcmf_bus_preinit() it does not need
to be called in brcmf_usb_bus_setup().

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 262f2b53

drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c

+2 −5
Original line number Diff line number Diff line
@@ -1146,8 +1146,9 @@ static int brcmf_usb_get_fwname(struct device *dev, u32 chip, u32 chiprev, 
}



static const struct brcmf_bus_ops brcmf_usb_bus_ops = {

	.txdata = brcmf_usb_tx,

	.preinit = brcmf_usb_up,

	.stop = brcmf_usb_down,

	.txdata = brcmf_usb_tx,

	.txctl = brcmf_usb_tx_ctlpkt,

	.rxctl = brcmf_usb_rx_ctlpkt,

	.wowl_config = brcmf_usb_wowl_config,
@@ -1165,10 +1166,6 @@ static int brcmf_usb_bus_setup(struct brcmf_usbdev_info *devinfo) 
		return ret;

	}



	ret = brcmf_usb_up(devinfo->dev);

	if (ret)

		goto fail;



	ret = brcmf_bus_started(devinfo->dev);

	if (ret)

		goto fail;