mirror of https://gitee.com/openkylin/linux.git
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:
parent
9088566176
commit
2c94404c30
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue