mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
rt2x00: Fix rt2800usb detection in rt2800lib.
rt2800lib incorrectly detected whether RT2800USB was enabled because it didn't account for a modularized RT2800USB driver. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
65182b9fb0
commit
b2ec153a63
1 changed files with 2 additions and 2 deletions
|
@ -37,7 +37,7 @@
|
|||
#include <linux/module.h>
|
||||
|
||||
#include "rt2x00.h"
|
||||
#ifdef CONFIG_RT2800USB
|
||||
#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)
|
||||
#include "rt2x00usb.h"
|
||||
#endif
|
||||
#include "rt2800lib.h"
|
||||
|
@ -1121,7 +1121,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
|
|||
|
||||
if (rt2x00_intf_is_usb(rt2x00dev)) {
|
||||
rt2800_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);
|
||||
#ifdef CONFIG_RT2800USB
|
||||
#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)
|
||||
rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,
|
||||
USB_MODE_RESET, REGISTER_TIMEOUT);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue