diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:31:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:31:51 -0400 |
| commit | 815868e7b5c207ba42d5b317ccc51f8112732268 (patch) | |
| tree | c0531faf1c8925ba36fc2cb6e9ac17b1ce0f35d5 /drivers/net/wireless/ath/ath9k/hif_usb.c | |
| parent | 084cb0fe773dc3dbe2bb08039dbd0e9e93d103ce (diff) | |
| parent | f8036965ccec4d786d8bf09bf57b793542cb3dce (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hif_usb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index ad9134bddd1e..61c1bee3f26a 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -745,13 +745,17 @@ static int ath9k_hif_usb_alloc_urbs(struct hif_device_usb *hif_dev) /* RX */ if (ath9k_hif_usb_alloc_rx_urbs(hif_dev) < 0) - goto err; + goto err_rx; /* Register Read */ if (ath9k_hif_usb_alloc_reg_in_urb(hif_dev) < 0) - goto err; + goto err_reg; return 0; +err_reg: + ath9k_hif_usb_dealloc_rx_urbs(hif_dev); +err_rx: + ath9k_hif_usb_dealloc_tx_urbs(hif_dev); err: return -ENOMEM; } |