3.5-stable patches

added patches:
	usb-emi62-remove-__devinit-from-the-struct-usb_device_id-table.patch
	usb-vt6656-remove-__devinit-from-the-struct-usb_device_id-table.patch

diff --git a/queue-3.5/series b/queue-3.5/series
new file mode 100644 (file)
index 0000000..a41f87f
--- /dev/null
+++ b/queue-3.5/series
@@ -0,0 +1,2 @@
+usb-vt6656-remove-__devinit-from-the-struct-usb_device_id-table.patch
+usb-emi62-remove-__devinit-from-the-struct-usb_device_id-table.patch

diff --git a/queue-3.5/usb-emi62-remove-__devinit-from-the-struct-usb_device_id-table.patch b/queue-3.5/usb-emi62-remove-__devinit-from-the-struct-usb_device_id-table.patch
new file mode 100644 (file)
index 0000000..85634db
--- /dev/null
+++ b/queue-3.5/usb-emi62-remove-__devinit-from-the-struct-usb_device_id-table.patch
@@ -0,0 +1,40 @@
+From 83957df21dd94655d2b026e0944a69ff37b83988 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 17 Aug 2012 17:48:41 -0700
+Subject: USB: emi62: remove __devinit* from the struct usb_device_id table
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+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>
+
+---
+ drivers/usb/misc/emi62.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/misc/emi62.c
++++ b/drivers/usb/misc/emi62.c
+@@ -232,7 +232,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 */
+ };

diff --git a/queue-3.5/usb-vt6656-remove-__devinit-from-the-struct-usb_device_id-table.patch b/queue-3.5/usb-vt6656-remove-__devinit-from-the-struct-usb_device_id-table.patch
new file mode 100644 (file)
index 0000000..a9001bf
--- /dev/null
+++ b/queue-3.5/usb-vt6656-remove-__devinit-from-the-struct-usb_device_id-table.patch
@@ -0,0 +1,42 @@
+From 4d088876f24887cd15a29db923f5f37db6a99f21 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 17 Aug 2012 17:48:33 -0700
+Subject: USB: vt6656: remove __devinit* from the struct usb_device_id table
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 4d088876f24887cd15a29db923f5f37db6a99f21 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: Forest Bond <forest@alittletooquiet.net>
+CC: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
+CC: "David S. Miller" <davem@davemloft.net>
+CC: Jesper Juhl <jj@chaosbits.net>
+CC: Jiri Pirko <jpirko@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/vt6656/main_usb.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/staging/vt6656/main_usb.c
++++ b/drivers/staging/vt6656/main_usb.c
+@@ -222,7 +222,7 @@ DEVICE_PARAM(b80211hEnable, "802.11h mod
+ // Static vars definitions
+ //
+ 
+-static struct usb_device_id vt6656_table[] __devinitdata = {
++static struct usb_device_id vt6656_table[] = {
+       {USB_DEVICE(VNT_USB_VENDOR_ID, VNT_USB_PRODUCT_ID)},
+       {}
+ };