hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Woodhouse 2007-12-06 14:41:08 +00:00 committed by David S. Miller
parent 9088566176
commit 2c94404c30
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/libertas/if_usb.c
View File

@ -222,6 +222,11 @@ static int if_usb_probe(struct usb_interface *intf,
if (lbs_start_card(priv)) if (lbs_start_card(priv))
goto err_start_card; 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_get_dev(udev);
usb_set_intfdata(intf, cardp); usb_set_intfdata(intf, cardp);

4
drivers/net/wireless/libertas/main.c
View File

@ -999,10 +999,6 @@ static int lbs_setup_firmware(struct lbs_private *priv)
priv->mesh_autostart_enabled = 0; 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; ret = 0;
done: done:
lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);