diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-14 19:53:49 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-14 19:53:49 +0200 |
| commit | 9316f0e3c6ba524d8fa14bfded048b252891931a (patch) | |
| tree | 60326e5943997bb72aaf2a375f8a20c61ec7bbcd /drivers/net/wireless/rtlwifi/usb.c | |
| parent | drivers/isdn/gigaset/common.c: Remove useless kfree (diff) | |
| parent | rtlwifi: Remove EXPERIMENTAL as pre-requisite for the drivers (diff) | |
| download | linux-9316f0e3c6ba524d8fa14bfded048b252891931a.tar.xz linux-9316f0e3c6ba524d8fa14bfded048b252891931a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 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 914046903cfd..030beb45d8b0 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c @@ -120,7 +120,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, if (status < 0 && count++ < 4) pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n", - value, status, le32_to_cpu(*(u32 *)pdata)); + value, status, *(u32 *)pdata); return status; } |