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>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 418dcab8b1cc48cb3ec9732c59d9eec344628704..f8589283d7bcc6c5e688a038c2d129d438e4466e 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -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);
 

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index ed02c02c96da0ddb738db62d1a1901d68c948e2f..a5b573ce54546322370cad239ff4d827d1453034 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -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);