aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/if_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 8ff57a6f251f..0a3795048c2c 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -389,9 +389,9 @@ static int if_usb_reset_device(struct usb_card_rec *cardp)
389 cmd->params.reset.action = cpu_to_le16(CMD_ACT_HALT); 389 cmd->params.reset.action = cpu_to_le16(CMD_ACT_HALT);
390 usb_tx_block(cardp, cardp->bulk_out_buffer, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset)); 390 usb_tx_block(cardp, cardp->bulk_out_buffer, 4 + S_DS_GEN + sizeof(struct cmd_ds_802_11_reset));
391 391
392 msleep(10); 392 msleep(100);
393 ret = usb_reset_device(cardp->udev); 393 ret = usb_reset_device(cardp->udev);
394 msleep(10); 394 msleep(100);
395 395
396 lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret); 396 lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
397 397
@@ -500,7 +500,7 @@ static void if_usb_receive_fwload(struct urb *urb)
500 return; 500 return;
501 } 501 }
502 502
503 if (cardp->bootcmdresp == 0) { 503 if (cardp->bootcmdresp <= 0) {
504 memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET, 504 memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET,
505 sizeof(bootcmdresp)); 505 sizeof(bootcmdresp));
506 if (le16_to_cpu(cardp->udev->descriptor.bcdDevice) < 0x3106) { 506 if (le16_to_cpu(cardp->udev->descriptor.bcdDevice) < 0x3106) {