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

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

libertas: Move SET_BOOT2_VER command to if_usb where it belongs 



This is meaningless for non-USB devices and unimplemented in their
firmware. It's somewhat dubious for USB devices too, but that's a
different story.

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

drivers/net/wireless/libertas/if_usb.c

+5 −0
Original line number Diff line number Diff line
@@ -222,6 +222,11 @@ static int if_usb_probe(struct usb_interface *intf, 
	if (lbs_start_card(priv))

		goto err_start_card;



	/* Set the boot2 version in firmware, ignoring errors. */

	(void)lbs_prepare_and_send_command(priv, CMD_SET_BOOT2_VER,

					   0, CMD_OPTION_WAITFORRSP, 0, NULL);





	usb_get_dev(udev);

	usb_set_intfdata(intf, cardp);

drivers/net/wireless/libertas/main.c

+0 −4
Original line number Diff line number Diff line
@@ -999,10 +999,6 @@ static int lbs_setup_firmware(struct lbs_private *priv) 
		priv->mesh_autostart_enabled = 0;

	}



       /* Set the boot2 version in firmware */

       ret = lbs_prepare_and_send_command(priv, CMD_SET_BOOT2_VER,

                                   0, CMD_OPTION_WAITFORRSP, 0, NULL);



	ret = 0;

done:

	lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);