diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-26 10:32:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-26 10:32:13 -0400 |
| commit | 330ee00412bbaefa7d0597a1bed7804e818ba91c (patch) | |
| tree | 0d086857f4e704f4945463e87e76ebf8ae32cad8 /drivers/net/wireless/rtlwifi/usb.c | |
| parent | 3da3fff8006c608f19a51859d44ba47ca8b41461 (diff) | |
| parent | f89ff6441df06abc2d95f3ef67525923032d6283 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index 030beb45d8b0..e3ea4b346889 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c | |||
| @@ -673,7 +673,7 @@ static int rtl_usb_start(struct ieee80211_hw *hw) | |||
| 673 | set_hal_start(rtlhal); | 673 | set_hal_start(rtlhal); |
| 674 | 674 | ||
| 675 | /* Start bulk IN */ | 675 | /* Start bulk IN */ |
| 676 | _rtl_usb_receive(hw); | 676 | err = _rtl_usb_receive(hw); |
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | return err; | 679 | return err; |