aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
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:40 -0700
commit6a239aaeaa8b207dd23175ae4674b5116edfca8f (patch)
tree6197cd8bd26ce0eca4d092e48f1fcb9bd8c9fcdd /drivers/media
parent72013257f37b157958a9b3a9a102fc6d3f7dde0a (diff)
downloadkernel_samsung_smdk4412-6a239aaeaa8b207dd23175ae4674b5116edfca8f.zip
kernel_samsung_smdk4412-6a239aaeaa8b207dd23175ae4674b5116edfca8f.tar.gz
kernel_samsung_smdk4412-6a239aaeaa8b207dd23175ae4674b5116edfca8f.tar.bz2
USB: spca506: remove __devinit* from the struct usb_device_id table
commit e694d518886c7afedcdd1732477832b2e32744e4 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/spca506.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 89fec4c..731cd16 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -685,7 +685,7 @@ static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x06e1, 0xa190)},
/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
{USB_DEVICE(0x0733, 0x0430)}, */