diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-17 17:48:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 10:00:03 -0700 |
| commit | 7d79cc4869cd9fdc47736a5fe44c195813cef4cd (patch) | |
| tree | 4f9e6ac839b5e3fdce412cf46703cef3dfde8618 | |
| parent | 61fe808721d1b13c811f6d9a2809628e4ef6bf06 (diff) | |
| download | linux-3.10-7d79cc4869cd9fdc47736a5fe44c195813cef4cd.tar.gz linux-3.10-7d79cc4869cd9fdc47736a5fe44c195813cef4cd.tar.bz2 linux-3.10-7d79cc4869cd9fdc47736a5fe44c195813cef4cd.zip | |
USB: emi62: remove __devinit* from the struct usb_device_id table
commit 83957df21dd94655d2b026e0944a69ff37b83988 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: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/misc/emi62.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 4e0f167a6c4..8be96de5f6e 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c @@ -256,7 +256,7 @@ wraperr: return err; } -static const struct usb_device_id id_table[] __devinitconst = { +static const struct usb_device_id id_table[] = { { USB_DEVICE(EMI62_VENDOR_ID, EMI62_PRODUCT_ID) }, { } /* Terminating entry */ }; |