diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-17 17:48:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 10:00:06 -0700 |
| commit | 5be8fc241c52f469cd8f2c9e4ebd66ce4ab9df34 (patch) | |
| tree | 21e7558992c429e89240b83396580292fad8b611 | |
| parent | 660345c4411ec182f2b735c3e19106ea468a9184 (diff) | |
| download | linux-3.10-5be8fc241c52f469cd8f2c9e4ebd66ce4ab9df34.tar.gz linux-3.10-5be8fc241c52f469cd8f2c9e4ebd66ce4ab9df34.tar.bz2 linux-3.10-5be8fc241c52f469cd8f2c9e4ebd66ce4ab9df34.zip | |
USB: winbond: remove __devinit* from the struct usb_device_id table
commit 43a34695d9cd79c6659f09da6d3b0624f3dd169f upstream.
This structure needs to always stick around, even if CONFIG_HOTPLUG
is disabled, otherwise we can oops when trying to probe a device that
was added after the structure is thrown away.
Thanks to Fengguang Wu and Bjørn Mork for tracking this issue down.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Bjørn Mork <bjorn@mork.no>
CC: Pavel Machek <pavel@ucw.cz>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: "John W. Linville" <linville@tuxdriver.com>
CC: Eliad Peller <eliad@wizery.com>
CC: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/winbond/wbusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index c3751a71838..9160049ff54 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c @@ -25,7 +25,7 @@ MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION("0.1"); -static const struct usb_device_id wb35_table[] __devinitconst = { +static const struct usb_device_id wb35_table[] = { { USB_DEVICE(0x0416, 0x0035) }, { USB_DEVICE(0x18E8, 0x6201) }, { USB_DEVICE(0x18E8, 0x6206) }, |