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

Commit c8ba39d0 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: improve reliability of firmware reloading on USB 



Increase the delay between issuing the RESET command and the usb reset,
and be prepared to discard more than one 'normal' packet from it before
it resets.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8552855f

drivers/net/wireless/libertas/if_usb.c

+3 −3
Original line number Diff line number Diff line
@@ -389,9 +389,9 @@ static int if_usb_reset_device(struct usb_card_rec *cardp) 
	cmd->params.reset.action = cpu_to_le16(CMD_ACT_HALT);

	usb_tx_block(cardp, cardp->bulk_out_buffer, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset));



	msleep(10);

	msleep(100);

	ret = usb_reset_device(cardp->udev);

	msleep(10);

	msleep(100);



	lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
@@ -500,7 +500,7 @@ static void if_usb_receive_fwload(struct urb *urb) 
		return;

	}



	if (cardp->bootcmdresp == 0) {

	if (cardp->bootcmdresp <= 0) {

		memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET,

			sizeof(bootcmdresp));

		if (le16_to_cpu(cardp->udev->descriptor.bcdDevice) < 0x3106) {