diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-06 14:41:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:05 -0800 |
| commit | 2c94404c30008a10ccd3c7e31645626eb90a8a06 (patch) | |
| tree | bf34728439a7d7e77c20a4acf74657ee5bd402b1 | |
| parent | 9088566176cb7f7361e862557eb20adfdd1bfc1f (diff) | |
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>
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 418dcab8b1c..f8589283d7b 100644 --- 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 ed02c02c96d..a5b573ce545 100644 --- 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); |