---

yaml --- r: 79111 b: refs/heads/master c: 2c94404 h: refs/heads/master i: 79109: f8ff107 79107: 936a44c 79103: e53a420 v: v3
git-mirror · Jan 28, 2008 · 75d346c · 75d346c
1 parent bbb05df
commit 75d346c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9088566176cb7f7361e862557eb20adfdd1bfc1f
+refs/heads/master: 2c94404c30008a10ccd3c7e31645626eb90a8a06
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/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/trunk/drivers/net/wireless/libertas/main.c b/trunk/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);