diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:11:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:11:56 -0400 |
commit | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (patch) | |
tree | 1e25cc32521d06ae876de18bb8e48b3cf9d30808 /drivers/net/wireless/libertas | |
parent | 1a63c353c856c9f6d44a533afb6ad6dbbcdea683 (diff) | |
parent | 0d91f22b75347d9503b17a42b6c74d3f7750acd6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index e906616232a..efaf8503220 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -487,11 +487,12 @@ static int if_usb_reset_device(struct if_usb_card *cardp) | |||
487 | */ | 487 | */ |
488 | static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload, uint16_t nb) | 488 | static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload, uint16_t nb) |
489 | { | 489 | { |
490 | int ret = -1; | 490 | int ret; |
491 | 491 | ||
492 | /* check if device is removed */ | 492 | /* check if device is removed */ |
493 | if (cardp->surprise_removed) { | 493 | if (cardp->surprise_removed) { |
494 | lbs_deb_usbd(&cardp->udev->dev, "Device removed\n"); | 494 | lbs_deb_usbd(&cardp->udev->dev, "Device removed\n"); |
495 | ret = -ENODEV; | ||
495 | goto tx_ret; | 496 | goto tx_ret; |
496 | } | 497 | } |
497 | 498 | ||
@@ -504,7 +505,6 @@ static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload, uint16_t nb | |||
504 | 505 | ||
505 | if ((ret = usb_submit_urb(cardp->tx_urb, GFP_ATOMIC))) { | 506 | if ((ret = usb_submit_urb(cardp->tx_urb, GFP_ATOMIC))) { |
506 | lbs_deb_usbd(&cardp->udev->dev, "usb_submit_urb failed: %d\n", ret); | 507 | lbs_deb_usbd(&cardp->udev->dev, "usb_submit_urb failed: %d\n", ret); |
507 | ret = -1; | ||
508 | } else { | 508 | } else { |
509 | lbs_deb_usb2(&cardp->udev->dev, "usb_submit_urb success\n"); | 509 | lbs_deb_usb2(&cardp->udev->dev, "usb_submit_urb success\n"); |
510 | ret = 0; | 510 | ret = 0; |