---

yaml --- r: 79157 b: refs/heads/master c: c8ba39d h: refs/heads/master i: 79155: 1bef00a v: v3
git-mirror · Jan 28, 2008 · d30fc0c · d30fc0c
1 parent dbe63c2
commit d30fc0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8552855f9860b222673e86a88de2543f53f83dc2
+refs/heads/master: c8ba39d0605200c81f43c59418871e036d973685
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -389,9 +389,9 @@ static int if_usb_reset_device(struct usb_card_rec *cardp)
 	cmd->params.reset.action = cpu_to_le16(CMD_ACT_HALT);
 	usb_tx_block(cardp, cardp->bulk_out_buffer, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset));
 
-	msleep(10);
+	msleep(100);
 	ret = usb_reset_device(cardp->udev);
-	msleep(10);
+	msleep(100);
 
 	lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
 
@@ -500,7 +500,7 @@ static void if_usb_receive_fwload(struct urb *urb)
 		return;
 	}
 
-	if (cardp->bootcmdresp == 0) {
+	if (cardp->bootcmdresp <= 0) {
 		memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET,
 			sizeof(bootcmdresp));
 		if (le16_to_cpu(cardp->udev->descriptor.bcdDevice) < 0x3106) {