From d30fc0cc8d7671987ce074c8723675c04d066213 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 10 Dec 2007 18:53:34 -0500 Subject: [PATCH] --- yaml --- r: 79157 b: refs/heads/master c: c8ba39d0605200c81f43c59418871e036d973685 h: refs/heads/master i: 79155: 1bef00a60f27593b18181e6af2630fb66ba54c18 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/if_usb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d0374033a034..509f7d84243c 100644 --- 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 index 8ff57a6f251f..0a3795048c2c 100644 --- 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) {