aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-03-11 12:45:20 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-03-11 12:45:20 -0700
commit56d82c332e789b0b1874af3141b56608869827da (patch)
treeed5773b67a07566321d281d254789b3d1715f2cc /usb
parentb9e8d367c5c1fcfc67351c8f4a93e56ac877b511 (diff)
downloadpatches-56d82c332e789b0b1874af3141b56608869827da.tar.gz
remove patches now upstream
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-cypress_m8-add-ups-powercom.patch54
-rw-r--r--usb/usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch35
-rw-r--r--usb/usb-fix-ehci-unlink-regressions.patch144
-rw-r--r--usb/usb-fix-usb-serial-generic-recursive-lock.patch52
-rw-r--r--usb/usb-fsl_usb2_udc-fix-broken-kconfig.patch31
-rw-r--r--usb/usb-g_printer.h-does-not-need-to-be-unifdef-ed.patch28
-rw-r--r--usb/usb-new-ftdi_sio-device-id.patch44
-rw-r--r--usb/usb-option-add-novatel-device-ids.patch108
-rw-r--r--usb/usb-remove-__kernel__-check-from-non-exported-gadget.h.patch37
-rw-r--r--usb/usb-update-mailing-list-information-in-documentation.patch39
-rw-r--r--usb/usb-usbaudio-handle-kcalloc-failure.patch32
11 files changed, 0 insertions, 604 deletions
diff --git a/usb/usb-cypress_m8-add-ups-powercom.patch b/usb/usb-cypress_m8-add-ups-powercom.patch
deleted file mode 100644
index 267775ebf3bd1f..00000000000000
--- a/usb/usb-cypress_m8-add-ups-powercom.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From akpm@linux-foundation.org Wed Mar 5 11:41:15 2008
-From: Dmitry Shapin <shapin@googlemail.com>
-Date: Tue, 04 Mar 2008 15:25:10 -0800
-Subject: USB: cypress_m8: add UPS Powercom (0d9f:0002)
-To: greg@kroah.com
-Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, shapin@googlemail.com, shapin@gmail.com
-Message-ID: <200803042325.m24NPAua003208@imap1.linux-foundation.org>
-
-
-From: Dmitry Shapin <shapin@googlemail.com>
-
-Add support for UPS Powercom USB interface (0d9f:0002) in chip CY7C63723.
-In my case, this Powercom BNT800AP.
-
-Signed-off-by: Dmitry Shapin <shapin@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/cypress_m8.c | 2 ++
- drivers/usb/serial/cypress_m8.h | 4 ++++
- 2 files changed, 6 insertions(+)
-
---- a/drivers/usb/serial/cypress_m8.c
-+++ b/drivers/usb/serial/cypress_m8.c
-@@ -94,6 +94,7 @@ static struct usb_device_id id_table_ear
-
- static struct usb_device_id id_table_cyphidcomrs232 [] = {
- { USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },
-+ { USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },
- { } /* Terminating entry */
- };
-
-@@ -106,6 +107,7 @@ static struct usb_device_id id_table_com
- { USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB) },
- { USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB_LT20) },
- { USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },
-+ { USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },
- { USB_DEVICE(VENDOR_ID_DAZZLE, PRODUCT_ID_CA42) },
- { } /* Terminating entry */
- };
---- a/drivers/usb/serial/cypress_m8.h
-+++ b/drivers/usb/serial/cypress_m8.h
-@@ -19,6 +19,10 @@
- #define VENDOR_ID_CYPRESS 0x04b4
- #define PRODUCT_ID_CYPHIDCOM 0x5500
-
-+/* Powercom UPS, chip CY7C63723 */
-+#define VENDOR_ID_POWERCOM 0x0d9f
-+#define PRODUCT_ID_UPS 0x0002
-+
- /* Nokia CA-42 USB to serial cable */
- #define VENDOR_ID_DAZZLE 0x07d0
- #define PRODUCT_ID_CA42 0x4101
diff --git a/usb/usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch b/usb/usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch
deleted file mode 100644
index 5f3aa7c7767ba4..00000000000000
--- a/usb/usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From akpm@linux-foundation.org Wed Mar 5 11:40:17 2008
-From: Andrew Morton <akpm@linux-foundation.org>
-Date: Tue, 04 Mar 2008 15:25:08 -0800
-Subject: USB: drivers/usb/storage/sddr55.c: fix uninitialized var warnings
-To: greg@kroah.com
-Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org
-Message-ID: <200803042325.m24NP87U003202@imap1.linux-foundation.org>
-
-
-From: Andrew Morton <akpm@linux-foundation.org>
-
-drivers/usb/storage/sddr55.c: In function 'sddr55_transport':
-drivers/usb/storage/sddr55.c:526: warning: 'deviceID' may be used uninitialized in this function
-drivers/usb/storage/sddr55.c:525: warning: 'manufacturerID' may be used uninitialized in this function
-
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/storage/sddr55.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/storage/sddr55.c
-+++ b/drivers/usb/storage/sddr55.c
-@@ -522,8 +522,8 @@ int sddr55_reset(struct us_data *us) {
-
- static unsigned long sddr55_get_capacity(struct us_data *us) {
-
-- unsigned char manufacturerID;
-- unsigned char deviceID;
-+ unsigned char uninitialized_var(manufacturerID);
-+ unsigned char uninitialized_var(deviceID);
- int result;
- struct sddr55_card_info *info = (struct sddr55_card_info *)us->extra;
-
diff --git a/usb/usb-fix-ehci-unlink-regressions.patch b/usb/usb-fix-ehci-unlink-regressions.patch
deleted file mode 100644
index e59353513255d6..00000000000000
--- a/usb/usb-fix-ehci-unlink-regressions.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From david-b@pacbell.net Mon Mar 10 14:28:17 2008
-From: David Brownell <david-b@pacbell.net>
-Date: Fri, 7 Mar 2008 13:49:42 -0800
-Subject: USB: fix ehci unlink regressions
-To: Greg KH <greg@kroah.com>
-Cc: linux-usb@vger.kernel.org
-Message-ID: <200803071349.43471.david-b@pacbell.net>
-Content-Disposition: inline
-
-
-The recent EHCI driver update to split the IAA watchdog timer out from
-the other timers made several things work better, but not everything;
-and it created a couple new issues in bugzilla. Ergo this patch:
-
- - Handle a should-be-rare SMP race between the watchdog firing
- and (very late) IAA interrupts;
-
- - Remove a shouldn't-have-been-added WARN_ON() test;
-
- - Guard against one observed OOPS;
-
- - If this watchdog fires during clean HC shutdown, it should act
- as a NOP instead of interfering with the shutdown sequence;
-
- - Guard against silicon errata hypothesized by some vendors:
- * IAA status latch broken, but IAAD cleared OK;
- * IAAD wasn't cleared when IAA status got reported;
-
-The WARN_ON is in bugzilla as 10168; the OOPS as 10078; these are
-both regressions.
-
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Tested-by: Gordon Farquharson <gordonfarquharson@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/host/ehci-hcd.c | 62 ++++++++++++++++++++++++++++++++------------
- 1 file changed, 46 insertions(+), 16 deletions(-)
-
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -281,23 +281,44 @@ static void ehci_iaa_watchdog(unsigned l
- {
- struct ehci_hcd *ehci = (struct ehci_hcd *) param;
- unsigned long flags;
-- u32 status, cmd;
-
- spin_lock_irqsave (&ehci->lock, flags);
-- WARN_ON(!ehci->reclaim);
-
-- status = ehci_readl(ehci, &ehci->regs->status);
-- cmd = ehci_readl(ehci, &ehci->regs->command);
-- ehci_dbg(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd);
--
-- /* lost IAA irqs wedge things badly; seen first with a vt8235 */
-- if (ehci->reclaim) {
-- if (status & STS_IAA) {
-- ehci_vdbg (ehci, "lost IAA\n");
-+ /* Lost IAA irqs wedge things badly; seen first with a vt8235.
-+ * So we need this watchdog, but must protect it against both
-+ * (a) SMP races against real IAA firing and retriggering, and
-+ * (b) clean HC shutdown, when IAA watchdog was pending.
-+ */
-+ if (ehci->reclaim
-+ && !timer_pending(&ehci->iaa_watchdog)
-+ && HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {
-+ u32 cmd, status;
-+
-+ /* If we get here, IAA is *REALLY* late. It's barely
-+ * conceivable that the system is so busy that CMD_IAAD
-+ * is still legitimately set, so let's be sure it's
-+ * clear before we read STS_IAA. (The HC should clear
-+ * CMD_IAAD when it sets STS_IAA.)
-+ */
-+ cmd = ehci_readl(ehci, &ehci->regs->command);
-+ if (cmd & CMD_IAAD)
-+ ehci_writel(ehci, cmd & ~CMD_IAAD,
-+ &ehci->regs->command);
-+
-+ /* If IAA is set here it either legitimately triggered
-+ * before we cleared IAAD above (but _way_ late, so we'll
-+ * still count it as lost) ... or a silicon erratum:
-+ * - VIA seems to set IAA without triggering the IRQ;
-+ * - IAAD potentially cleared without setting IAA.
-+ */
-+ status = ehci_readl(ehci, &ehci->regs->status);
-+ if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
- COUNT (ehci->stats.lost_iaa);
- ehci_writel(ehci, STS_IAA, &ehci->regs->status);
- }
-- ehci_writel(ehci, cmd & ~CMD_IAAD, &ehci->regs->command);
-+
-+ ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n",
-+ status, cmd);
- end_unlink_async(ehci);
- }
-
-@@ -631,7 +652,7 @@ static int ehci_run (struct usb_hcd *hcd
- static irqreturn_t ehci_irq (struct usb_hcd *hcd)
- {
- struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-- u32 status, pcd_status = 0;
-+ u32 status, pcd_status = 0, cmd;
- int bh;
-
- spin_lock (&ehci->lock);
-@@ -652,7 +673,7 @@ static irqreturn_t ehci_irq (struct usb_
-
- /* clear (just) interrupts */
- ehci_writel(ehci, status, &ehci->regs->status);
-- ehci_readl(ehci, &ehci->regs->command); /* unblock posted write */
-+ cmd = ehci_readl(ehci, &ehci->regs->command);
- bh = 0;
-
- #ifdef EHCI_VERBOSE_DEBUG
-@@ -673,8 +694,17 @@ static irqreturn_t ehci_irq (struct usb_
-
- /* complete the unlinking of some qh [4.15.2.3] */
- if (status & STS_IAA) {
-- COUNT (ehci->stats.reclaim);
-- end_unlink_async(ehci);
-+ /* guard against (alleged) silicon errata */
-+ if (cmd & CMD_IAAD) {
-+ ehci_writel(ehci, cmd & ~CMD_IAAD,
-+ &ehci->regs->command);
-+ ehci_dbg(ehci, "IAA with IAAD still set?\n");
-+ }
-+ if (ehci->reclaim) {
-+ COUNT(ehci->stats.reclaim);
-+ end_unlink_async(ehci);
-+ } else
-+ ehci_dbg(ehci, "IAA with nothing to reclaim?\n");
- }
-
- /* remote wakeup [4.3.1] */
-@@ -781,7 +811,7 @@ static int ehci_urb_enqueue (
- static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
- {
- /* failfast */
-- if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))
-+ if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state) && ehci->reclaim)
- end_unlink_async(ehci);
-
- /* if it's not linked then there's nothing to do */
diff --git a/usb/usb-fix-usb-serial-generic-recursive-lock.patch b/usb/usb-fix-usb-serial-generic-recursive-lock.patch
deleted file mode 100644
index 548ca36828d876..00000000000000
--- a/usb/usb-fix-usb-serial-generic-recursive-lock.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From zaitcev@redhat.com Wed Mar 5 11:39:23 2008
-From: Pete Zaitcev <zaitcev@redhat.com>
-Date: Tue, 4 Mar 2008 23:28:42 -0800
-Subject: USB: fix usb-serial generic recursive lock
-To: greg@kroah.com
-Cc: zaitcev@redhat.com, linux-usb@vger.kernel.org
-Message-ID: <20080304232842.c783d383.zaitcev@redhat.com>
-
-
-Nobody should be using the generic usb-serial for anything other than
-testing. Still, it's not a good thing that it's easy to lock up. There
-is a traceback from NMI oopser here:
- https://bugzilla.redhat.com/show_bug.cgi?id=431379
-
-But in short, if a line discipline has a chance to echo anything, input
-can loop back a write method. So, don't call tty_flip_buffer_push from
-under a lock taken on write path.
-
-Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/generic.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/serial/generic.c
-+++ b/drivers/usb/serial/generic.c
-@@ -323,7 +323,7 @@ static void flush_and_resubmit_read_urb
- room = tty_buffer_request_room(tty, urb->actual_length);
- if (room) {
- tty_insert_flip_string(tty, urb->transfer_buffer, room);
-- tty_flip_buffer_push(tty); /* is this allowed from an URB callback ? */
-+ tty_flip_buffer_push(tty);
- }
- }
-
-@@ -349,10 +349,12 @@ void usb_serial_generic_read_bulk_callba
-
- /* Throttle the device if requested by tty */
- spin_lock_irqsave(&port->lock, flags);
-- if (!(port->throttled = port->throttle_req))
-- /* Handle data and continue reading from device */
-+ if (!(port->throttled = port->throttle_req)) {
-+ spin_unlock_irqrestore(&port->lock, flags);
- flush_and_resubmit_read_urb(port);
-- spin_unlock_irqrestore(&port->lock, flags);
-+ } else {
-+ spin_unlock_irqrestore(&port->lock, flags);
-+ }
- }
- EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback);
-
diff --git a/usb/usb-fsl_usb2_udc-fix-broken-kconfig.patch b/usb/usb-fsl_usb2_udc-fix-broken-kconfig.patch
deleted file mode 100644
index eff78be593fbf4..00000000000000
--- a/usb/usb-fsl_usb2_udc-fix-broken-kconfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From leoli@freescale.com Thu Mar 6 10:21:08 2008
-From: Li Yang <leoli@freescale.com>
-Date: Thu, 6 Mar 2008 18:40:07 +0800
-Subject: USB: fsl_usb2_udc: fix broken Kconfig
-To: greg@kroah.com
-Cc: david-b@pacbell.net, linux-usb@vger.kernel.org, Li Yang <leoli@freescale.com>
-Message-ID: <1204800007-11568-1-git-send-email-leoli@freescale.com>
-
-
-The patch fixes broken Kconfig caused by the name change of MPC834x option.
-It also makes fsl_usb2_udc selectable on new platforms like MPC837x.
-
-Signed-off-by: Li Yang <leoli@freescale.com>
-Acked-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/gadget/Kconfig
-+++ b/drivers/usb/gadget/Kconfig
-@@ -131,7 +131,7 @@ config USB_ATMEL_USBA
-
- config USB_GADGET_FSL_USB2
- boolean "Freescale Highspeed USB DR Peripheral Controller"
-- depends on MPC834x || PPC_MPC831x
-+ depends on FSL_SOC
- select USB_GADGET_DUALSPEED
- help
- Some of Freescale PowerPC processors have a High Speed
diff --git a/usb/usb-g_printer.h-does-not-need-to-be-unifdef-ed.patch b/usb/usb-g_printer.h-does-not-need-to-be-unifdef-ed.patch
deleted file mode 100644
index 32ec6e8a622701..00000000000000
--- a/usb/usb-g_printer.h-does-not-need-to-be-unifdef-ed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From rpjday@crashcourse.ca Fri Mar 7 08:29:46 2008
-From: "Robert P. J. Day" <rpjday@crashcourse.ca>
-Date: Fri, 7 Mar 2008 11:02:00 -0500 (EST)
-Subject: USB: g_printer.h does not need to be "unifdef"ed.
-To: linux-usb@vger.kernel.org
-Message-ID: <alpine.LFD.1.00.0803071100170.27973@localhost.localdomain>
-
-
-
-Since the header file g_printer.h doesn't depend on __KERNEL__,
-there's no need to unifdef it in the Kbuild file.
-
-Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- include/linux/usb/Kbuild | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/linux/usb/Kbuild
-+++ b/include/linux/usb/Kbuild
-@@ -3,5 +3,5 @@ header-y += cdc.h
- header-y += ch9.h
- header-y += gadgetfs.h
- header-y += midi.h
--unifdef-y += g_printer.h
-+header-y += g_printer.h
-
diff --git a/usb/usb-new-ftdi_sio-device-id.patch b/usb/usb-new-ftdi_sio-device-id.patch
deleted file mode 100644
index ea3cf20057c976..00000000000000
--- a/usb/usb-new-ftdi_sio-device-id.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From mirko.bordignon@ieee.org Mon Mar 10 14:24:18 2008
-From: Mirko Bordignon <mirko.bordignon@ieee.org>
-Date: Mon, 10 Mar 2008 11:38:55 +0100
-Subject: USB: new ftdi_sio device id
-To: "Greg KH" <greg@kroah.com>
-Message-ID: <3eba494d0803100338l3d359298l25c7bf2ee890cfb9@mail.gmail.com>
-
-From: Mirko Bordignon <mirko.bordignon@ieee.org>
-
-Here is a patch that adds support for the propox jtagcable II dongle
-(http://www.propox.com/products/t_117.html): their PID was missing,
-therefore we were not able to have the device recognized though it uses
-a standard FTDI chip.
-
-Signed-off-by: Mirko Bordignon <mirko.bordignon@ieee.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c | 1 +
- drivers/usb/serial/ftdi_sio.h | 3 +++
- 2 files changed, 4 insertions(+)
-
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -359,6 +359,7 @@ static struct usb_device_id id_table_com
- { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
- { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) },
- { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
- .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- { USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID),
---- a/drivers/usb/serial/ftdi_sio.h
-+++ b/drivers/usb/serial/ftdi_sio.h
-@@ -557,6 +557,9 @@
- #define TML_VID 0x1B91 /* Vendor ID */
- #define TML_USB_SERIAL_PID 0x0064 /* USB - Serial Converter */
-
-+/* Propox devices */
-+#define FTDI_PROPOX_JTAGCABLEII_PID 0xD738
-+
- /* Commands */
- #define FTDI_SIO_RESET 0 /* Reset the port */
- #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
diff --git a/usb/usb-option-add-novatel-device-ids.patch b/usb/usb-option-add-novatel-device-ids.patch
deleted file mode 100644
index 3ce2b500c186ff..00000000000000
--- a/usb/usb-option-add-novatel-device-ids.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From foo@baz Tue Apr 9 12:12:43 2002
-Date: Wed, 5 Mar 2008 08:26:18 -0000
-To: Greg KH <greg@kroah.com>
-From: Dirk DeSchepper <ddeschepper@nvtl.com>
-Subject: USB: option: add novatel device ids
-
-This updates the option driver with a lot more novatel driver ids.
-
-From: Dirk DeSchepper <ddeschepper@nvtl.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/option.c | 75 ++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 62 insertions(+), 13 deletions(-)
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -111,6 +111,42 @@ static int option_send_setup(struct usb
- #define HUAWEI_PRODUCT_E220BIS 0x1004
-
- #define NOVATELWIRELESS_VENDOR_ID 0x1410
-+
-+/* MERLIN EVDO PRODUCTS */
-+#define NOVATELWIRELESS_PRODUCT_V640 0x1100
-+#define NOVATELWIRELESS_PRODUCT_V620 0x1110
-+#define NOVATELWIRELESS_PRODUCT_V740 0x1120
-+#define NOVATELWIRELESS_PRODUCT_V720 0x1130
-+
-+/* MERLIN HSDPA/HSPA PRODUCTS */
-+#define NOVATELWIRELESS_PRODUCT_U730 0x1400
-+#define NOVATELWIRELESS_PRODUCT_U740 0x1410
-+#define NOVATELWIRELESS_PRODUCT_U870 0x1420
-+#define NOVATELWIRELESS_PRODUCT_XU870 0x1430
-+#define NOVATELWIRELESS_PRODUCT_X950D 0x1450
-+
-+/* EXPEDITE PRODUCTS */
-+#define NOVATELWIRELESS_PRODUCT_EV620 0x2100
-+#define NOVATELWIRELESS_PRODUCT_ES720 0x2110
-+#define NOVATELWIRELESS_PRODUCT_E725 0x2120
-+#define NOVATELWIRELESS_PRODUCT_EU730 0x2400
-+#define NOVATELWIRELESS_PRODUCT_EU740 0x2410
-+#define NOVATELWIRELESS_PRODUCT_EU870D 0x2420
-+
-+/* OVATION PRODUCTS */
-+#define NOVATELWIRELESS_PRODUCT_MC727 0x4100
-+#define NOVATELWIRELESS_PRODUCT_MC950D 0x4400
-+
-+/* FUTURE NOVATEL PRODUCTS */
-+#define NOVATELWIRELESS_PRODUCT_EVDO_1 0x6000
-+#define NOVATELWIRELESS_PRODUCT_HSPA_1 0x7000
-+#define NOVATELWIRELESS_PRODUCT_EMBEDDED_1 0x8000
-+#define NOVATELWIRELESS_PRODUCT_GLOBAL_1 0x9000
-+#define NOVATELWIRELESS_PRODUCT_EVDO_2 0x6001
-+#define NOVATELWIRELESS_PRODUCT_HSPA_2 0x7001
-+#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001
-+#define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001
-+
- #define DELL_VENDOR_ID 0x413C
-
- #define KYOCERA_VENDOR_ID 0x0c88
-@@ -168,21 +204,34 @@ static struct usb_device_id option_ids[]
- { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1130) }, /* Novatel Merlin S720 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1400) }, /* Novatel U730 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1410) }, /* Novatel U740 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1420) }, /* Novatel EU870 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2100) }, /* Novatel EV620 CDMA/EV-DO */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, /* Novatel Merlin V720/S720/PC720 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, /* Novatel U730/U740 (VF version) */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, /* Novatel U740 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, /* Novatel U870 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, /* Novatel Merlin XU870 HSDPA/3G */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, /* Novatel X950D */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */
- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4100) }, /* Novatel U727 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4400) }, /* Novatel MC950 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_1) }, /* Novatel Global product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_2) }, /* Novatel EVDO product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */
-+
- { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
- { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
- { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
diff --git a/usb/usb-remove-__kernel__-check-from-non-exported-gadget.h.patch b/usb/usb-remove-__kernel__-check-from-non-exported-gadget.h.patch
deleted file mode 100644
index 5d972288485152..00000000000000
--- a/usb/usb-remove-__kernel__-check-from-non-exported-gadget.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From rpjday@crashcourse.ca Fri Mar 7 09:03:59 2008
-From: "Robert P. J. Day" <rpjday@crashcourse.ca>
-Date: Fri, 7 Mar 2008 11:40:07 -0500 (EST)
-Subject: USB: Remove __KERNEL__ check from non-exported gadget.h.
-To: linux-usb@vger.kernel.org
-Message-ID: <alpine.LFD.1.00.0803071138270.28191@localhost.localdomain>
-
-
-
-Since the header file gadget.h isn't being exported to userspace,
-there seems to be little point having a __KERNEL__ proprocessor check.
-
-Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- include/linux/usb/gadget.h | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/include/linux/usb/gadget.h
-+++ b/include/linux/usb/gadget.h
-@@ -15,8 +15,6 @@
- #ifndef __LINUX_USB_GADGET_H
- #define __LINUX_USB_GADGET_H
-
--#ifdef __KERNEL__
--
- struct usb_ep;
-
- /**
-@@ -848,6 +846,4 @@ extern struct usb_ep *usb_ep_autoconfig(
-
- extern void usb_ep_autoconfig_reset(struct usb_gadget *) __devinit;
-
--#endif /* __KERNEL__ */
--
- #endif /* __LINUX_USB_GADGET_H */
diff --git a/usb/usb-update-mailing-list-information-in-documentation.patch b/usb/usb-update-mailing-list-information-in-documentation.patch
deleted file mode 100644
index d2d56c80fb510a..00000000000000
--- a/usb/usb-update-mailing-list-information-in-documentation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From rpjday@crashcourse.ca Mon Mar 10 14:28:59 2008
-From: "Robert P. J. Day" <rpjday@crashcourse.ca>
-Date: Fri, 7 Mar 2008 15:08:17 -0500 (EST)
-Subject: USB:Update mailing list information in documentation
-To: linux-usb@vger.kernel.org
-Message-ID: <alpine.LFD.1.00.0803071507050.31685@localhost.localdomain>
-
-
-
-Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
-
----
- Documentation/usb/usb-help.txt | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/Documentation/usb/usb-help.txt
-+++ b/Documentation/usb/usb-help.txt
-@@ -1,5 +1,5 @@
- usb-help.txt
--2000-July-12
-+2008-Mar-7
-
- For USB help other than the readme files that are located in
- Documentation/usb/*, see the following:
-@@ -10,9 +10,7 @@ Linux-USB project: http://www.linux-usb
- Linux USB Guide: http://linux-usb.sourceforge.net
- Linux-USB device overview (working devices and drivers):
- http://www.qbik.ch/usb/devices/
--
--The Linux-USB mailing lists are:
-- linux-usb-users@lists.sourceforge.net for general user help
-- linux-usb-devel@lists.sourceforge.net for developer discussions
-+
-+The Linux-USB mailing list is at linux-usb@vger.kernel.org
-
- ###
diff --git a/usb/usb-usbaudio-handle-kcalloc-failure.patch b/usb/usb-usbaudio-handle-kcalloc-failure.patch
deleted file mode 100644
index 9af42be77dd577..00000000000000
--- a/usb/usb-usbaudio-handle-kcalloc-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From akpm@linux-foundation.org Wed Mar 5 11:42:03 2008
-From: akpm@linux-foundation.org
-Date: Tue, 04 Mar 2008 15:25:11 -0800
-Subject: USB: usbaudio: handle kcalloc failure
-To: greg@kroah.com
-Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, jim@meyering.net, meyering@redhat.com
-Message-ID: <200803042325.m24NPBOa003214@imap1.linux-foundation.org>
-
-
-From: Jim Meyering <jim@meyering.net>
-
-sound/usb/usbaudio.c (check_hw_params_convention): Handle kcalloc failure.
-
-Signed-off-by: Jim Meyering <meyering@redhat.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- sound/usb/usbaudio.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sound/usb/usbaudio.c
-+++ b/sound/usb/usbaudio.c
-@@ -1762,6 +1762,8 @@ static int check_hw_params_convention(st
-
- channels = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL);
- rates = kcalloc(MAX_MASK, sizeof(u32), GFP_KERNEL);
-+ if (!channels || !rates)
-+ goto __out;
-
- list_for_each(p, &subs->fmt_list) {
- struct audioformat *f;
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:06:27 +0000