From 75d346c2ee7b11483df44e763e73cfaffbb41c01 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 6 Dec 2007 14:41:08 +0000 Subject: [PATCH] --- yaml --- r: 79111 b: refs/heads/master c: 2c94404c30008a10ccd3c7e31645626eb90a8a06 h: refs/heads/master i: 79109: f8ff107065a19da50dc094a388d9951d02f5e97b 79107: 936a44c18a1414b6d478f4ddd34a93837f839cc2 79103: e53a42085d722ad450543618c16bb407ef546b7d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/if_usb.c | 5 +++++ trunk/drivers/net/wireless/libertas/main.c | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6feaf47c0df3..4f2baba2bc5f 100644 --- 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 index 418dcab8b1cc..f8589283d7bc 100644 --- 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 index ed02c02c96da..a5b573ce5454 100644 --- 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);