| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Fri, 17 Aug 2012 17:48:29 -0700 |
| Subject: USB: rtl8187: 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 a3433179d0822ccfa8e80aa4d1d52843bd2dcc63 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: Herton Ronaldo Krzesinski <herton@canonical.com> |
| CC: Hin-Tak Leung <htl10@users.sourceforge.net> |
| CC: Larry Finger <Larry.Finger@lwfinger.net> |
| CC: "John W. Linville" <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c |
| index 71a30b0..5330240 100644 |
| --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c |
| +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c |
| @@ -44,7 +44,7 @@ MODULE_AUTHOR("Larry Finger <Larry.Finger@lwfinger.net>"); |
| MODULE_DESCRIPTION("RTL8187/RTL8187B USB wireless driver"); |
| MODULE_LICENSE("GPL"); |
| |
| -static struct usb_device_id rtl8187_table[] __devinitdata = { |
| +static struct usb_device_id rtl8187_table[] = { |
| /* Asus */ |
| {USB_DEVICE(0x0b05, 0x171d), .driver_info = DEVICE_RTL8187}, |
| /* Belkin */ |
