| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Fri, 17 Aug 2012 17:48:37 -0700 |
| Subject: USB: winbond: remove __devinit* from the struct usb_device_id table |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/staging/winbond/wbusb.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c |
| index ef36054..0ca857a 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) }, |
