summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-18 02:48:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-18 02:50:44 +0200
commitec063351684298e295dc9444d143ddfd6ab02df8 (patch)
tree76710abaf17bff3dff2917706e8d4608e3be4043 /drivers/media/video
parentUSB: smsusb: remove __devinit* from the struct usb_device_id table (diff)
downloadlinux-ec063351684298e295dc9444d143ddfd6ab02df8.tar.xz
linux-ec063351684298e295dc9444d143ddfd6ab02df8.zip
USB: jl2005bcd: remove __devinit* from the struct usb_device_id table
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: stable <stable@vger.kernel.org> CC: Hans de Goede <hdegoede@redhat.com> CC: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/video')
-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 cf9d9fca5b84..234777116e5f 100644
--- a/drivers/media/video/gspca/jl2005bcd.c
+++ b/drivers/media/video/gspca/jl2005bcd.c
@@ -512,7 +512,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)},
{}
};