aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-17 17:48:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:21 -0700
commit3ecad65934b8d33eeab93f2230f6418642013d27 (patch)
treea9bcc2311233a4bc64c60c2e9353501d734f8ce6
parent3c8ac60ddf5f8efaa1b65466fa357954259e387d (diff)
downloadparrot-3ecad65934b8d33eeab93f2230f6418642013d27.tar.gz
USB: jl2005bcd: remove __devinit* from the struct usb_device_id table
commit ec063351684298e295dc9444d143ddfd6ab02df8 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: Hans de Goede <hdegoede@redhat.com> CC: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/video/gspca/jl2005bcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/jl2005bcd.c b/drivers/media/video/gspca/jl2005bcd.c
index 53f58ef367cfa..3264d878cfdef 100644
--- a/drivers/media/video/gspca/jl2005bcd.c
+++ b/drivers/media/video/gspca/jl2005bcd.c
@@ -510,7 +510,7 @@ static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0979, 0x0227)},
{}
};