aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-17 17:48:27 -0700
committerBen Hutchings <ben@decadent.org.uk>2012-09-12 03:37:10 +0100
commit75fc31282f88bf314ad4cee90e84f763e909da18 (patch)
tree1449f100beaedb07dbebb6586eaf76eea0251e44 /drivers/media
parentba98e0dd6eccff9cdb27e008c0a1310747e3fb8f (diff)
downloadkernel_samsung_smdk4412-75fc31282f88bf314ad4cee90e84f763e909da18.zip
kernel_samsung_smdk4412-75fc31282f88bf314ad4cee90e84f763e909da18.tar.gz
kernel_samsung_smdk4412-75fc31282f88bf314ad4cee90e84f763e909da18.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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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)}, */