Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2c94404c30008a10ccd3c7e31645626eb90a8a06
Commit: 2c94404c30008a10ccd3c7e31645626eb90a8a06
Parent: 9088566176cb7f7361e862557eb20adfdd1bfc1f
Author: David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 6 14:41:08 2007 +0000
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:05 2008 -0800
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 <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
drivers/net/wireless/libertas/if_usb.c | 5 +++++
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 418dcab..f858928 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 ed02c02..a5b573c 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
