diff options
37 files changed, 2 insertions, 1898 deletions
diff --git a/driver-core.current/sysfs-checking-for-null-instead-of-err_ptr.patch b/driver-core.current/sysfs-checking-for-null-instead-of-err_ptr.patch deleted file mode 100644 index 503906c9f7f951..00000000000000 --- a/driver-core.current/sysfs-checking-for-null-instead-of-err_ptr.patch +++ /dev/null @@ -1,34 +0,0 @@ -From error27@gmail.com Wed Sep 1 12:49:11 2010 -Date: Wed, 25 Aug 2010 09:12:29 +0200 -From: Dan Carpenter <error27@gmail.com> -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: "Eric W. Biederman" <ebiederm@xmission.com>, - Serge Hallyn <serue@us.ibm.com>, - Stephen Hemminger <shemminger@vyatta.com>, - linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org -Subject: sysfs: checking for NULL instead of ERR_PTR -Message-ID: <20100825071229.GP29330@bicker> -Content-Disposition: inline - -d_path() returns an ERR_PTR and it doesn't return NULL. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Cc: stable <stable@kernel.org> -Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - fs/sysfs/file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/sysfs/file.c -+++ b/fs/sysfs/file.c -@@ -340,7 +340,7 @@ static int sysfs_open_file(struct inode - char *p; - - p = d_path(&file->f_path, last_sysfs_file, sizeof(last_sysfs_file)); -- if (p) -+ if (!IS_ERR(p)) - memmove(last_sysfs_file, p, strlen(p) + 1); - - /* need attr_sd for attr and ops, its parent for kobj */ @@ -8,18 +8,11 @@ gregkh/gkh-version.patch ################################# # Driver core patches for 2.6.36 ################################# -driver-core.current/sysfs-checking-for-null-instead-of-err_ptr.patch + ################################# # TTY patches for 2.6.36 ################################# -tty.current/vt-fix-console-corruption-on-driver-hand-over.patch -tty.current/maintainers-orphan-isicom.patch -tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch -tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch -tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch - -# after patches sent to linus tty.current/serial-amba-pl010-fix-set_ldisc.patch tty.current/serial-mfd-fix-bug-in-serial_hsu_remove.patch @@ -27,48 +20,14 @@ tty.current/serial-mfd-fix-bug-in-serial_hsu_remove.patch ################################# # USB patches for 2.6.36 ################################# -usb.current/usb-s3c-hsotg-remove-debug-define.patch -usb.current/usb-ehci-ppc-of-problems-in-unwind.patch -usb.current/usb-rndis-section-mismatch-fix.patch -usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch -usb.current/usb-option-fix-incorrect-novatel-entries.patch -usb.current/usb-cp210x-add-new-device-id.patch -usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch -usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch -usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch -usb.current/usb-ssu100-turn-off-debug-flag.patch -usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch -usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch -usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch -usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch -usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch -usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch -usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch - -# after patches sent to linus usb.current/usb-musb_debugfs-don-t-use-the-struct-file-private_data-field-with-seq_files.patch usb.current/usb-ehci-disable-langwell-penwell-lpm-capability.patch usb.current/usb-otg-twl4030-fix-phy-initialization-v1.patch - ################################# # Staging patches for 2.6.36 ################################# -staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch -staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch -staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch -staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch -staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch -staging.current/staging-spectra-needs-linux-slab.h.patch -staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch -staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch -staging.current/staging-zram-free-device-memory-when-init-fails.patch -staging.current/staging-spectra-depend-on-x86_mrst.patch -staging.current/staging-octeon-depends-on-netdevices.patch -staging.current/staging-wlan-ng-explicitly-set-some-fields-in-cfg80211-interface.patch - -# after patches sent to linus staging.current/revert-staging-batman-adv-adding-netfilter-bridge-hooks.patch staging.current/staging-vt6655-fix-buffer-overflow.patch diff --git a/staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch b/staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch deleted file mode 100644 index 653de3b493263f..00000000000000 --- a/staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch +++ /dev/null @@ -1,32 +0,0 @@ -From andreas@infernal.debian.net Mon Aug 30 16:53:01 2010 -From: Andreas Bombe <aeb@debian.org> -To: linux-kernel@vger.kernel.org -Cc: Dominik Brodowski <linux@dominikbrodowski.net>, - Greg Kroah-Hartman <gregkh@suse.de>, devel@driverdev.osuosl.org, - Andreas Bombe <aeb@debian.org> -Subject: staging: comedi das08_cs.c: Fix io_req_t conversion -Date: Sat, 14 Aug 2010 03:24:22 +0200 -Message-Id: <1281749062-9907-1-git-send-email-aeb@debian.org> - -Commit 90abdc3b9 converted all PCMCIA users away from io_req_t. In -das08_cs.c the converted IO lines mask setting was added but the old -line using the now inexistent p_dev->io was not removed. - -Signed-off-by: Andreas Bombe <aeb@debian.org> -Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/comedi/drivers/das08_cs.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/staging/comedi/drivers/das08_cs.c -+++ b/drivers/staging/comedi/drivers/das08_cs.c -@@ -222,7 +222,6 @@ static int das08_pcmcia_config_loop(stru - p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; - p_dev->resource[0]->flags |= - pcmcia_io_cfg_data_width(io->flags); -- p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; - p_dev->resource[0]->start = io->win[0].base; - p_dev->resource[0]->end = io->win[0].len; - if (io->nwin > 1) { diff --git a/staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch b/staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch deleted file mode 100644 index 61aad0560c5414..00000000000000 --- a/staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch +++ /dev/null @@ -1,40 +0,0 @@ -From devel-bounces@linuxdriverproject.org Tue Aug 3 12:16:38 2010 -From: Haiyang Zhang <haiyangz@microsoft.com> -Subject: staging: hv: Fix missing functions for net_device_ops -Date: Tue, 3 Aug 2010 19:15:31 +0000 -Message-ID: <1FB5E1D5CA062146B38059374562DF728380C37B@TK5EX14MBXC126.redmond.corp.microsoft.com> - -From: Haiyang Zhang <haiyangz@microsoft.com> - -Fix missing functions for net_device_ops. -It's a bug when porting the drivers from 2.6.27 to 2.6.32. In 2.6.27, -the default functions for Ethernet, like eth_change_mtu(), were assigned -by ether_setup(). But in 2.6.32, these function pointers moved to -net_device_ops structure and no longer be assigned in ether_setup(). So -we need to set these functions in our driver code. It will ensure the -MTU won't be set beyond 1500. Otherwise, this can cause an error on the -server side, because the HyperV linux driver doesn't support jumbo frame -yet. - -Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> -Signed-off-by: Hank Janssen <hjanssen@microsoft.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/staging/hv/netvsc_drv.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/staging/hv/netvsc_drv.c -+++ b/drivers/staging/hv/netvsc_drv.c -@@ -327,6 +327,9 @@ static const struct net_device_ops devic - .ndo_stop = netvsc_close, - .ndo_start_xmit = netvsc_start_xmit, - .ndo_set_multicast_list = netvsc_set_multicast_list, -+ .ndo_change_mtu = eth_change_mtu, -+ .ndo_validate_addr = eth_validate_addr, -+ .ndo_set_mac_address = eth_mac_addr, - }; - - static int netvsc_probe(struct device *device) diff --git a/staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch b/staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch deleted file mode 100644 index c04ed93606d1eb..00000000000000 --- a/staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch +++ /dev/null @@ -1,43 +0,0 @@ -From devel-bounces@linuxdriverproject.org Thu Aug 5 12:30:40 2010 -From: Hank Janssen <hjanssen@microsoft.com> -Subject: staging: hv: Fixed bounce kmap problem by using correct index -Date: Thu, 5 Aug 2010 19:29:44 +0000 -Message-ID: <8AFC7968D54FB448A30D8F38F259C56223FEC87F@TK5EX14MBXC114.redmond.corp.microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com>, "'gregkh@suse.de'" <gregkh@suse.de> - -From: Hank Janssen <hjanssen@microsoft.com> - -Fixed bounce offset kmap problem by using correct index. -The symptom of the problem is that in some NAS appliances this problem -represents Itself by a unresponsive VM under a load with many clients writing -small files. - -Signed-off-by:Hank Janssen <hjanssen@microsoft.com> -Signed-off-by:Haiyang Zhang <haiyangz@microsoft.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/hv/storvsc_drv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/staging/hv/storvsc_drv.c -+++ b/drivers/staging/hv/storvsc_drv.c -@@ -495,7 +495,7 @@ static unsigned int copy_to_bounce_buffe - - /* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ - -- if (j == 0) -+ if (bounce_addr == 0) - bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0); - - while (srclen) { -@@ -556,7 +556,7 @@ static unsigned int copy_from_bounce_buf - destlen = orig_sgl[i].length; - /* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ - -- if (j == 0) -+ if (bounce_addr == 0) - bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0); - - while (destlen) { diff --git a/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch b/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch deleted file mode 100644 index 256133629f8cab..00000000000000 --- a/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch +++ /dev/null @@ -1,66 +0,0 @@ -From hjanssen@sailtheuniverse.com Thu Sep 2 13:06:54 2010 -Message-ID: <4C7E9721.2050405@sailtheuniverse.com> -Date: Wed, 01 Sep 2010 11:10:41 -0700 -From: Hank Janssen <hjanssen@microsoft.com> -To: hjanssen@microsoft.com, gregkh@suse.de, - devel@driverdev.osuosl.org, virtualization@lists.osdl.org, - linux-kernel@vger.kernel.org, Haiyang Zhang <haiyangz@microsoft.com> -Cc: Joe Perches <joe@perches.com> -Subject: staging: hv: Fixed lockup problem with bounce_buffer scatter list - -From: Hank Janssen <hjanssen@microsoft.com> - -Fixed lockup problem with bounce_buffer scatter list which caused -crashes in heavy loads. And minor code indentation cleanup in effected -area. - -Removed whitespace and noted minor indentation changes in description as -pointed out by Joe Perches. (Thanks for reviewing Joe) - -Signed-off-by: Hank Janssen <hjanssen@microsoft.com> -Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/staging/hv/storvsc_drv.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/drivers/staging/hv/storvsc_drv.c -+++ b/drivers/staging/hv/storvsc_drv.c -@@ -615,6 +615,7 @@ static int storvsc_queuecommand(struct s - unsigned int request_size = 0; - int i; - struct scatterlist *sgl; -+ unsigned int sg_count = 0; - - DPRINT_DBG(STORVSC_DRV, "scmnd %p dir %d, use_sg %d buf %p len %d " - "queue depth %d tagged %d", scmnd, scmnd->sc_data_direction, -@@ -697,6 +698,7 @@ static int storvsc_queuecommand(struct s - request->DataBuffer.Length = scsi_bufflen(scmnd); - if (scsi_sg_count(scmnd)) { - sgl = (struct scatterlist *)scsi_sglist(scmnd); -+ sg_count = scsi_sg_count(scmnd); - - /* check if we need to bounce the sgl */ - if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) { -@@ -731,15 +733,16 @@ static int storvsc_queuecommand(struct s - scsi_sg_count(scmnd)); - - sgl = cmd_request->bounce_sgl; -+ sg_count = cmd_request->bounce_sgl_count; - } - - request->DataBuffer.Offset = sgl[0].offset; - -- for (i = 0; i < scsi_sg_count(scmnd); i++) { -+ for (i = 0; i < sg_count; i++) { - DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n", - i, sgl[i].length, sgl[i].offset); - request->DataBuffer.PfnArray[i] = -- page_to_pfn(sg_page((&sgl[i]))); -+ page_to_pfn(sg_page((&sgl[i]))); - } - } else if (scsi_sglist(scmnd)) { - /* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */ diff --git a/staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch b/staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch deleted file mode 100644 index a5ce955c5b5f35..00000000000000 --- a/staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch +++ /dev/null @@ -1,43 +0,0 @@ -From hjanssen@microsoft.com Thu Aug 5 12:30:06 2010 -From: Hank Janssen <hjanssen@microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com>, - "'gregkh@suse.de'" <gregkh@suse.de> -Subject: staging: hv: Fixed the value of the 64bit-hole inside ring buffer -Date: Thu, 5 Aug 2010 19:30:01 +0000 -Message-ID: <8AFC7968D54FB448A30D8F38F259C56223FEC892@TK5EX14MBXC114.redmond.corp.microsoft.com> - -From: Haiyang Zhang <haiyangz@microsoft.com> - -Fixed the value of the 64bit-hole inside ring buffer, this -caused a problem on Hyper-V when running checked Windows builds. - -Checked builds of Windows are used internally and given to external -system integrators at times. They are builds that for example that all -elements in a structure follow the definition of that Structure. The bug -this fixed was for a field that we did not fill in at all (Because we do -Not use it on the Linux side), and the checked build of windows gives -errors on it internally to the Windows logs. - -This fixes that error. - -Signed-off-by:Hank Janssen <hjanssen@microsoft.com> -Signed-off-by:Haiyang Zhang <haiyangz@microsoft.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/hv/ring_buffer.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/drivers/staging/hv/ring_buffer.c -+++ b/drivers/staging/hv/ring_buffer.c -@@ -193,8 +193,7 @@ Description: - static inline u64 - GetRingBufferIndices(struct hv_ring_buffer_info *RingInfo) - { -- return ((u64)RingInfo->RingBuffer->WriteIndex << 32) -- || RingInfo->RingBuffer->ReadIndex; -+ return (u64)RingInfo->RingBuffer->WriteIndex << 32; - } - - diff --git a/staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch b/staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch deleted file mode 100644 index 6404960843bca3..00000000000000 --- a/staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch +++ /dev/null @@ -1,47 +0,0 @@ -From devel-bounces@linuxdriverproject.org Thu Aug 5 12:34:01 2010 -From: Hank Janssen <hjanssen@microsoft.com> -Subject: staging: hv: Increased storvsc ringbuffer and max_io_requests -Date: Thu, 5 Aug 2010 19:30:31 +0000 -Message-ID: <8AFC7968D54FB448A30D8F38F259C56223FEC89F@TK5EX14MBXC114.redmond.corp.microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com>, "'gregkh@suse.de'" <gregkh@suse.de> - -From: Hank Janssen <hjanssen@microsoft.com> - -Increased storvsc ringbuffer and max_io_requests. This now more -closely mimics the numbers on Hyper-V. And will allow more IO requests -to take place for the SCSI driver. - -Max_IO is set to double from what it was before, Hyper-V allows it and -we have had appliance builder requests to see if it was a problem to -increase the number. - -Ringbuffer size for storvsc is now increased because I have seen A few buffer -problems on extremely busy systems. They were Set pretty low before. -And since max_io_requests is increased I Really needed to increase the buffer -as well. - - -Signed-off-by:Hank Janssen <hjanssen@microsoft.com> -Signed-off-by:Haiyang Zhang <haiyangz@microsoft.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/hv/storvsc_api.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/staging/hv/storvsc_api.h -+++ b/drivers/staging/hv/storvsc_api.h -@@ -28,10 +28,10 @@ - #include "vmbus_api.h" - - /* Defines */ --#define STORVSC_RING_BUFFER_SIZE (10*PAGE_SIZE) -+#define STORVSC_RING_BUFFER_SIZE (20*PAGE_SIZE) - #define BLKVSC_RING_BUFFER_SIZE (20*PAGE_SIZE) - --#define STORVSC_MAX_IO_REQUESTS 64 -+#define STORVSC_MAX_IO_REQUESTS 128 - - /* - * In Hyper-V, each port/path/target maps to 1 scsi host adapter. In diff --git a/staging.current/staging-octeon-depends-on-netdevices.patch b/staging.current/staging-octeon-depends-on-netdevices.patch deleted file mode 100644 index d6a4db3a8bf8f4..00000000000000 --- a/staging.current/staging-octeon-depends-on-netdevices.patch +++ /dev/null @@ -1,37 +0,0 @@ -From randy.dunlap@oracle.com Mon Aug 30 16:56:54 2010 -Date: Tue, 24 Aug 2010 14:09:40 -0700 -From: Randy Dunlap <randy.dunlap@oracle.com> -To: devel@driverdev.osuosl.org -Cc: gregkh@suse.de, support@caviumnetworks.com, - Arnaud Lacombe <lacombar@gmail.com> -Subject: Staging: octeon: depends on NETDEVICES -Message-Id: <20100824140940.57369e83.randy.dunlap@oracle.com> - -From: Randy Dunlap <randy.dunlap@oracle.com> - -OCTEON_ETHERNET should depend on NETDEVICES. - -Fixes this kconfig warning: - -warning: (NET_DSA && NET && EXPERIMENTAL && NETDEVICES && !S390 || ... -|| OCTEON_ETHERNET && STAGING && !STAGING_EXCLUDE_BUILD && CPU_CAVIUM_OCTEON) selects PHYLIB which has unmet direct dependencies (!S390 && NETDEVICES) - -Reported-by: Arnaud Lacombe <lacombar@gmail.com> -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Cc: support@caviumnetworks.com -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/octeon/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/staging/octeon/Kconfig -+++ b/drivers/staging/octeon/Kconfig -@@ -1,6 +1,6 @@ - config OCTEON_ETHERNET - tristate "Cavium Networks Octeon Ethernet support" -- depends on CPU_CAVIUM_OCTEON -+ depends on CPU_CAVIUM_OCTEON && NETDEVICES - select PHYLIB - select MDIO_OCTEON - help diff --git a/staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch b/staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch deleted file mode 100644 index fe3e6208e6b814..00000000000000 --- a/staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch +++ /dev/null @@ -1,112 +0,0 @@ -From ben@decadent.org.uk Mon Aug 30 16:53:26 2010 -Date: Sun, 29 Aug 2010 02:13:11 +0100 -From: Ben Hutchings <ben@decadent.org.uk> -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: devel@driverdev.osuosl.org -Subject: Staging: rt2870sta: Add more device IDs from vendor drivers -Message-ID: <20100829011311.GU5063@decadent.org.uk> - -Taken from DPO_RT3070_LinuxSTA_V2.3.0.4_20100604.tar.bz2 and -2010_0709_RT2870_Linux_STA_v2.4.0.1.tar.bz2, with duplicates removed. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/rt2860/usb_main_dev.c | 41 ++++++++++++++++++++++++++++++++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - ---- a/drivers/staging/rt2860/usb_main_dev.c -+++ b/drivers/staging/rt2860/usb_main_dev.c -@@ -44,6 +44,7 @@ struct usb_device_id rtusb_usb_id[] = { - {USB_DEVICE(0x07B8, 0x2870)}, /* AboCom */ - {USB_DEVICE(0x07B8, 0x2770)}, /* AboCom */ - {USB_DEVICE(0x0DF6, 0x0039)}, /* Sitecom 2770 */ -+ {USB_DEVICE(0x0DF6, 0x003F)}, /* Sitecom 2770 */ - {USB_DEVICE(0x083A, 0x7512)}, /* Arcadyan 2770 */ - {USB_DEVICE(0x0789, 0x0162)}, /* Logitec 2870 */ - {USB_DEVICE(0x0789, 0x0163)}, /* Logitec 2870 */ -@@ -95,7 +96,8 @@ struct usb_device_id rtusb_usb_id[] = { - {USB_DEVICE(0x050d, 0x815c)}, - {USB_DEVICE(0x1482, 0x3C09)}, /* Abocom */ - {USB_DEVICE(0x14B2, 0x3C09)}, /* Alpha */ -- {USB_DEVICE(0x04E8, 0x2018)}, /* samsung */ -+ {USB_DEVICE(0x04E8, 0x2018)}, /* samsung linkstick2 */ -+ {USB_DEVICE(0x1690, 0x0740)}, /* Askey */ - {USB_DEVICE(0x5A57, 0x0280)}, /* Zinwell */ - {USB_DEVICE(0x5A57, 0x0282)}, /* Zinwell */ - {USB_DEVICE(0x7392, 0x7718)}, -@@ -105,21 +107,34 @@ struct usb_device_id rtusb_usb_id[] = { - {USB_DEVICE(0x1737, 0x0071)}, /* Linksys WUSB600N */ - {USB_DEVICE(0x0411, 0x00e8)}, /* Buffalo WLI-UC-G300N */ - {USB_DEVICE(0x050d, 0x815c)}, /* Belkin F5D8053 */ -+ {USB_DEVICE(0x100D, 0x9031)}, /* Motorola 2770 */ - #endif /* RT2870 // */ - #ifdef RT3070 - {USB_DEVICE(0x148F, 0x3070)}, /* Ralink 3070 */ - {USB_DEVICE(0x148F, 0x3071)}, /* Ralink 3071 */ - {USB_DEVICE(0x148F, 0x3072)}, /* Ralink 3072 */ - {USB_DEVICE(0x0DB0, 0x3820)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x0DB0, 0x871C)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x0DB0, 0x822C)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x0DB0, 0x871B)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x0DB0, 0x822B)}, /* Ralink 3070 */ - {USB_DEVICE(0x0DF6, 0x003E)}, /* Sitecom 3070 */ - {USB_DEVICE(0x0DF6, 0x0042)}, /* Sitecom 3072 */ -+ {USB_DEVICE(0x0DF6, 0x0048)}, /* Sitecom 3070 */ -+ {USB_DEVICE(0x0DF6, 0x0047)}, /* Sitecom 3071 */ - {USB_DEVICE(0x14B2, 0x3C12)}, /* AL 3070 */ - {USB_DEVICE(0x18C5, 0x0012)}, /* Corega 3070 */ - {USB_DEVICE(0x083A, 0x7511)}, /* Arcadyan 3070 */ -+ {USB_DEVICE(0x083A, 0xA701)}, /* SMC 3070 */ -+ {USB_DEVICE(0x083A, 0xA702)}, /* SMC 3072 */ - {USB_DEVICE(0x1740, 0x9703)}, /* EnGenius 3070 */ - {USB_DEVICE(0x1740, 0x9705)}, /* EnGenius 3071 */ - {USB_DEVICE(0x1740, 0x9706)}, /* EnGenius 3072 */ -+ {USB_DEVICE(0x1740, 0x9707)}, /* EnGenius 3070 */ -+ {USB_DEVICE(0x1740, 0x9708)}, /* EnGenius 3071 */ -+ {USB_DEVICE(0x1740, 0x9709)}, /* EnGenius 3072 */ - {USB_DEVICE(0x13D3, 0x3273)}, /* AzureWave 3070 */ -+ {USB_DEVICE(0x13D3, 0x3305)}, /* AzureWave 3070*/ - {USB_DEVICE(0x1044, 0x800D)}, /* Gigabyte GN-WB32L 3070 */ - {USB_DEVICE(0x2019, 0xAB25)}, /* Planex Communications, Inc. RT3070 */ - {USB_DEVICE(0x07B8, 0x3070)}, /* AboCom 3070 */ -@@ -132,14 +147,36 @@ struct usb_device_id rtusb_usb_id[] = { - {USB_DEVICE(0x07D1, 0x3C0D)}, /* D-Link 3070 */ - {USB_DEVICE(0x07D1, 0x3C0E)}, /* D-Link 3070 */ - {USB_DEVICE(0x07D1, 0x3C0F)}, /* D-Link 3070 */ -+ {USB_DEVICE(0x07D1, 0x3C16)}, /* D-Link 3070 */ -+ {USB_DEVICE(0x07D1, 0x3C17)}, /* D-Link 8070 */ - {USB_DEVICE(0x1D4D, 0x000C)}, /* Pegatron Corporation 3070 */ - {USB_DEVICE(0x1D4D, 0x000E)}, /* Pegatron Corporation 3070 */ - {USB_DEVICE(0x5A57, 0x5257)}, /* Zinwell 3070 */ - {USB_DEVICE(0x5A57, 0x0283)}, /* Zinwell 3072 */ - {USB_DEVICE(0x04BB, 0x0945)}, /* I-O DATA 3072 */ -+ {USB_DEVICE(0x04BB, 0x0947)}, /* I-O DATA 3070 */ -+ {USB_DEVICE(0x04BB, 0x0948)}, /* I-O DATA 3072 */ - {USB_DEVICE(0x203D, 0x1480)}, /* Encore 3070 */ -+ {USB_DEVICE(0x20B8, 0x8888)}, /* PARA INDUSTRIAL 3070 */ -+ {USB_DEVICE(0x0B05, 0x1784)}, /* Asus 3072 */ -+ {USB_DEVICE(0x203D, 0x14A9)}, /* Encore 3070*/ -+ {USB_DEVICE(0x0DB0, 0x899A)}, /* MSI 3070*/ -+ {USB_DEVICE(0x0DB0, 0x3870)}, /* MSI 3070*/ -+ {USB_DEVICE(0x0DB0, 0x870A)}, /* MSI 3070*/ -+ {USB_DEVICE(0x0DB0, 0x6899)}, /* MSI 3070 */ -+ {USB_DEVICE(0x0DB0, 0x3822)}, /* MSI 3070 */ -+ {USB_DEVICE(0x0DB0, 0x3871)}, /* MSI 3070 */ -+ {USB_DEVICE(0x0DB0, 0x871A)}, /* MSI 3070 */ -+ {USB_DEVICE(0x0DB0, 0x822A)}, /* MSI 3070 */ -+ {USB_DEVICE(0x0DB0, 0x3821)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x0DB0, 0x821A)}, /* Ralink 3070 */ -+ {USB_DEVICE(0x083A, 0xA703)}, /* IO-MAGIC */ -+ {USB_DEVICE(0x13D3, 0x3307)}, /* Azurewave */ -+ {USB_DEVICE(0x13D3, 0x3321)}, /* Azurewave */ -+ {USB_DEVICE(0x07FA, 0x7712)}, /* Edimax */ -+ {USB_DEVICE(0x0789, 0x0166)}, /* Edimax */ -+ {USB_DEVICE(0x148F, 0x2070)}, /* Edimax */ - #endif /* RT3070 // */ -- {USB_DEVICE(0x0DF6, 0x003F)}, /* Sitecom WL-608 */ - {USB_DEVICE(0x1737, 0x0077)}, /* Linksys WUSB54GC-EU v3 */ - {USB_DEVICE(0x2001, 0x3C09)}, /* D-Link */ - {USB_DEVICE(0x2001, 0x3C0A)}, /* D-Link 3072 */ diff --git a/staging.current/staging-spectra-depend-on-x86_mrst.patch b/staging.current/staging-spectra-depend-on-x86_mrst.patch deleted file mode 100644 index 02a2eeeb2d9b69..00000000000000 --- a/staging.current/staging-spectra-depend-on-x86_mrst.patch +++ /dev/null @@ -1,29 +0,0 @@ -From jeffm@suse.com Mon Aug 30 16:56:28 2010 -Message-ID: <4C73EF6A.5050603@suse.com> -Date: Tue, 24 Aug 2010 12:12:26 -0400 -From: Jeff Mahoney <jeffm@suse.com> -To: Greg Kroah-Hartman <GregKH@suse.de> -Subject: Staging: spectra: depend on X86_MRST - -lld_nand fails to build on arches without virt_to_bus. Since this driver -is specifically for hardware enablment on Moorestown, this patch adds -Moorestown MID support as a dependency. - -Signed-off-by: Jeff Mahoney <jeffm@suse.com> -Cc: David Woodhouse <dwmw2@infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/spectra/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/spectra/Kconfig -+++ b/drivers/staging/spectra/Kconfig -@@ -2,6 +2,7 @@ - menuconfig SPECTRA - tristate "Denali Spectra Flash Translation Layer" - depends on BLOCK -+ depends on X86_MRST - default n - ---help--- - Enable the FTL pseudo-filesystem used with the NAND Flash diff --git a/staging.current/staging-spectra-needs-linux-slab.h.patch b/staging.current/staging-spectra-needs-linux-slab.h.patch deleted file mode 100644 index 07ad0c9d4d10ba..00000000000000 --- a/staging.current/staging-spectra-needs-linux-slab.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From geert@linux-m68k.org Mon Aug 30 16:52:22 2010 -Date: Mon, 30 Aug 2010 08:57:49 +0200 (CEST) -From: Geert Uytterhoeven <geert@linux-m68k.org> -To: Greg Kroah-Hartman <gregkh@suse.de> -Subject: staging: spectra needs <linux/slab.h> -Message-ID: <alpine.DEB.2.00.1008300856010.28212@ayla.of.borg> - -On one of my m68k test builds I get: - -drivers/staging/spectra/ffsport.c: In function ‘ioctl_read_page_data’: -drivers/staging/spectra/ffsport.c:196: error: implicit declaration of function ‘kmalloc’ -drivers/staging/spectra/ffsport.c:196: warning: assignment makes pointer from integer without a cast -drivers/staging/spectra/ffsport.c:212: error: implicit declaration of function ‘kfree’ -drivers/staging/spectra/ffsport.c: In function ‘ioctl_write_page_data’: -drivers/staging/spectra/ffsport.c:229: warning: assignment makes pointer from integer without a cast -drivers/staging/spectra/ffsport.c: In function ‘SBD_setup_device’: -drivers/staging/spectra/ffsport.c:637: warning: assignment makes pointer from integer without a cast - -Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> -Acked-by: Pekka Enberg <penberg@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/spectra/ffsport.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/spectra/ffsport.c -+++ b/drivers/staging/spectra/ffsport.c -@@ -28,6 +28,7 @@ - #include <linux/log2.h> - #include <linux/init.h> - #include <linux/smp_lock.h> -+#include <linux/slab.h> - - /**** Helper functions used for Div, Remainder operation on u64 ****/ - diff --git a/staging.current/staging-wlan-ng-explicitly-set-some-fields-in-cfg80211-interface.patch b/staging.current/staging-wlan-ng-explicitly-set-some-fields-in-cfg80211-interface.patch deleted file mode 100644 index c7b993b4235089..00000000000000 --- a/staging.current/staging-wlan-ng-explicitly-set-some-fields-in-cfg80211-interface.patch +++ /dev/null @@ -1,39 +0,0 @@ -From karllinuxtest.relton@ntlworld.com Wed Sep 1 11:36:50 2010 -Subject: Staging: wlan-ng: Explicitly set some fields in cfg80211 interface -From: Karl Relton <karllinuxtest.relton@ntlworld.com> -To: Greg KH <greg@kroah.com> -Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org -Date: Wed, 11 Aug 2010 18:16:08 +0100 -Message-ID: <1281546968.2010.5.camel@dellpc> - - -The cfg80211 api has introduced a few new fields. Rather than assume -what cfg80211 api does by default, set these explicitly. - -Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/staging/wlan-ng/cfg80211.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/staging/wlan-ng/cfg80211.c -+++ b/drivers/staging/wlan-ng/cfg80211.c -@@ -219,6 +219,7 @@ int prism2_get_key(struct wiphy *wiphy, - return -ENOENT; - params.key_len = len; - params.key = wlandev->wep_keys[key_index]; -+ params.seq_len = 0; - - callback(cookie, ¶ms); - -@@ -735,6 +736,8 @@ struct wiphy *wlan_create_wiphy(struct d - priv->band.n_channels = ARRAY_SIZE(prism2_channels); - priv->band.bitrates = priv->rates; - priv->band.n_bitrates = ARRAY_SIZE(prism2_rates); -+ priv->band.band = IEEE80211_BAND_2GHZ; -+ priv->band.ht_cap.ht_supported = false; - wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band; - - set_wiphy_dev(wiphy, dev); diff --git a/staging.current/staging-zram-free-device-memory-when-init-fails.patch b/staging.current/staging-zram-free-device-memory-when-init-fails.patch deleted file mode 100644 index 8e908e6fb76fa0..00000000000000 --- a/staging.current/staging-zram-free-device-memory-when-init-fails.patch +++ /dev/null @@ -1,26 +0,0 @@ -From linux-next-owner@vger.kernel.org Mon Aug 30 16:55:05 2010 -Date: Sat, 28 Aug 2010 10:09:05 +0300 -From: Shahar Havivi <shaharh@redhat.com> -To: linux-next@vger.kernel.org -Cc: linux-kernel@vger.kernel.org, greg@kroah.com -Subject: Staging: zram: free device memory when init fails -Message-ID: <20100828070901.GA31943@redhat.com> -Content-Disposition: inline - -Signed-off-by: Shahar Havivi <shaharh@redhat.com> -Cc: Nitin Gupta <ngupta@vflare.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/staging/zram/zram_drv.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/zram/zram_drv.c -+++ b/drivers/staging/zram/zram_drv.c -@@ -769,6 +769,7 @@ static int __init zram_init(void) - free_devices: - while (dev_id) - destroy_device(&devices[--dev_id]); -+ kfree(devices); - unregister: - unregister_blkdev(zram_major, "zram"); - out: diff --git a/tty.current/maintainers-orphan-isicom.patch b/tty.current/maintainers-orphan-isicom.patch deleted file mode 100644 index c8e416d42dd640..00000000000000 --- a/tty.current/maintainers-orphan-isicom.patch +++ /dev/null @@ -1,30 +0,0 @@ -From jirislaby@gmail.com Wed Sep 1 12:57:23 2010 -From: Jiri Slaby <jslaby@suse.cz> -To: gregkh@suse.de -Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, - joe@perches.com -Subject: MAINTAINERS: orphan isicom -Date: Tue, 31 Aug 2010 17:08:52 +0200 -Message-Id: <1283267332-20879-1-git-send-email-jslaby@suse.cz> - -I do not maintain isicom anymore... - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - MAINTAINERS | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -3923,8 +3923,7 @@ F: Documentation/sound/oss/MultiSound - F: sound/oss/msnd* - - MULTITECH MULTIPORT CARD (ISICOM) --M: Jiri Slaby <jirislaby@gmail.com> --S: Maintained -+S: Orphan - F: drivers/char/isicom.c - F: include/linux/isicom.h - diff --git a/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch b/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch deleted file mode 100644 index 41156e15e89731..00000000000000 --- a/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From vapier@gentoo.org Wed Sep 1 13:01:10 2010 -From: Sonic Zhang <sonic.zhang@analog.com> -To: linux-serial@vger.kernel.org, - Greg Kroah-Hartman <gregkh@suse.de>, - Alan Cox <alan@lxorguk.ukuu.org.uk> -Cc: uclinux-dist-devel@blackfin.uclinux.org, - linux-kernel@vger.kernel.org, Sonic Zhang <sonic.zhang@analog.com> -Subject: serial: bfin_sport_uart: restore transmit frame sync fix -Date: Sat, 28 Aug 2010 16:32:55 -0400 -Message-Id: <1283027575-1686-1-git-send-email-vapier@gentoo.org> - -From: Sonic Zhang <sonic.zhang@analog.com> - -The large cleanup/rewrite of resources in commit ccf68e59e93181df9353c0cc -accidentally reverted an earlier fix in commit a19e8b205915b2925aca75b. -So restore it here. - -Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Cc: stable <stable@kernel.org> [.34 and newer] -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/serial/bfin_sport_uart.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/serial/bfin_sport_uart.c -+++ b/drivers/serial/bfin_sport_uart.c -@@ -121,7 +121,7 @@ static int sport_uart_setup(struct sport - unsigned int sclk = get_sclk(); - - /* Set TCR1 and TCR2, TFSR is not enabled for uart */ -- SPORT_PUT_TCR1(up, (ITFS | TLSBIT | ITCLK)); -+ SPORT_PUT_TCR1(up, (LATFS | ITFS | TFSR | TLSBIT | ITCLK)); - SPORT_PUT_TCR2(up, size + 1); - pr_debug("%s TCR1:%x, TCR2:%x\n", __func__, SPORT_GET_TCR1(up), SPORT_GET_TCR2(up)); - diff --git a/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch b/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch deleted file mode 100644 index dac19b6c8c3f07..00000000000000 --- a/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch +++ /dev/null @@ -1,45 +0,0 @@ -From philippe.langlais@stericsson.com Wed Sep 1 12:57:48 2010 -From: Philippe Langlais <philippe.langlais@stericsson.com> -To: <gregkh@suse.de> -Cc: <linux@treblig.org>, <STEricsson_nomadik_linux@list.st.com>, - <loic.pallardy@stericsson.com>, <vincent.guittot@stericsson.com>, - Philippe Langlais <philippe.langlais@stericsson.com> -Subject: serial: fix port type conflict between NS16550A & U6_16550A -Date: Tue, 31 Aug 2010 14:19:09 +0200 -Message-ID: <1283257149-3370-1-git-send-email-philippe.langlais@stericsson.com> - -Bug seen by Dr. David Alan Gilbert with sparse - -Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/serial.h | 3 +-- - include/linux/serial_core.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/include/linux/serial.h -+++ b/include/linux/serial.h -@@ -77,8 +77,7 @@ struct serial_struct { - #define PORT_16654 11 - #define PORT_16850 12 - #define PORT_RSA 13 /* RSA-DV II/S card */ --#define PORT_U6_16550A 14 --#define PORT_MAX 14 -+#define PORT_MAX 13 - - #define SERIAL_IO_PORT 0 - #define SERIAL_IO_HUB6 1 ---- a/include/linux/serial_core.h -+++ b/include/linux/serial_core.h -@@ -44,7 +44,8 @@ - #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */ - #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */ - #define PORT_AR7 18 /* Texas Instruments AR7 internal UART */ --#define PORT_MAX_8250 18 /* max port ID */ -+#define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */ -+#define PORT_MAX_8250 19 /* max port ID */ - - /* - * ARM specific type numbers. These are not currently guaranteed diff --git a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch deleted file mode 100644 index a78df7ba8772a7..00000000000000 --- a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch +++ /dev/null @@ -1,44 +0,0 @@ -From nathael.pajani@ed3l.fr Thu Sep 2 13:03:44 2010 -Message-ID: <4C7FAF58.9030700@ed3l.fr> -Date: Thu, 02 Sep 2010 16:06:16 +0200 -From: Nathael Pajani <nathael.pajani@ed3l.fr> -To: gregkh@suse.de, linux-kernel@vger.kernel.org -Cc: <torvalds@linux-foundation.org> -Subject: tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver - -I found a bug "by chance" in drivers/char/tty_io.c - -I mean "by chance" because I was just reading the code of the -tty_find_polling_driver() to make a new tty_find_by_name() function. - -In tty_find_polling_driver() the driver actually test "tty_line <= -p->num" while num refers to the number of struct tty_struct pointers -allocated for the p->ttys (p is a tty_driver), and tty_line is scanned -in a tty name, which can be for example ttyS2. Then tty_line equals 2. -And if p->num is 2, we have only p->ttys[0] and p->ttys[1], but no -p->ttys[2]. - -This is actually unharmful, for tty_find_polling_driver() is used only -in drivers/serial/kgdboc.c, and there's a test over there to find a -console with a matching index, which will never happen. - -This is still a bug anyway. - -Signed-off-by: Nathael Pajani <nathael.pajani@ed3l.fr> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/tty_io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/char/tty_io.c -+++ b/drivers/char/tty_io.c -@@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driv - if (*stp == '\0') - stp = NULL; - -- if (tty_line >= 0 && tty_line <= p->num && p->ops && -+ if (tty_line >= 0 && tty_line < p->num && p->ops && - p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { - res = tty_driver_kref_get(p); - *line = tty_line; diff --git a/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch b/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch deleted file mode 100644 index ce1dbd4b9e6f7f..00000000000000 --- a/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch +++ /dev/null @@ -1,79 +0,0 @@ -From currojerez@riseup.net Wed Sep 1 12:47:54 2010 -From: Francisco Jerez <currojerez@riseup.net> -To: linux-kernel@vger.kernel.org -Cc: qiaochong <qiaochong@loongson.cn>, - Greg Kroah-Hartman <gregkh@suse.de>, - Andrew Morton <akpm@linux-foundation.org>, - Alan Cox <alan@linux.intel.com> -Subject: vt: Fix console corruption on driver hand-over. -Date: Sun, 22 Aug 2010 17:37:24 +0200 -Message-Id: <1282491444-25364-1-git-send-email-currojerez@riseup.net> - -After 02f0777a0d6560eb995aade34a1b82f95c0452da "vc_origin" is no -longer reset to the screen buffer before calling the con_init() hook -of the new console driver. - -If the old driver wasn't using a fixed scanout buffer (e.g. the case -of vgacon) "vc_origin" may be a pointer to a VRAM location, and its -contents aren't guaranteed to be preserved after calling con_deinit() -on the old driver and con_init() on the new driver, i.e. the -subsequent console resize may fill the framebuffer with garbage. - -It can be reproduced in the transition from vgacon to the nouveau -framebuffer driver: in that case the legacy VGA aperture "vc_origin" -points to becomes unreadable after fbcon_init(). - -This patch reverts the mentioned commit. To avoid the problem it -intended to fix, stop using "vc_scr_end" in vc_do_resize() to -calculate how many rows we have to copy (actually the code looks -simpler this way without the help of "vc_scr_end"). - -Signed-off-by: Francisco Jerez <currojerez@riseup.net> -Cc: qiaochong <qiaochong@loongson.cn> -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Alan Cox <alan@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/vt.c | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - ---- a/drivers/char/vt.c -+++ b/drivers/char/vt.c -@@ -906,22 +906,16 @@ static int vc_do_resize(struct tty_struc - * bottom of buffer - */ - old_origin += (old_rows - new_rows) * old_row_size; -- end = vc->vc_scr_end; - } else { - /* - * Cursor is in no man's land, copy 1/2 screenful - * from the top and bottom of cursor position - */ - old_origin += (vc->vc_y - new_rows/2) * old_row_size; -- end = old_origin + (old_row_size * new_rows); - } -- } else -- /* -- * Cursor near the top, copy contents from the top of buffer -- */ -- end = (old_rows > new_rows) ? old_origin + -- (old_row_size * new_rows) : -- vc->vc_scr_end; -+ } -+ -+ end = old_origin + old_row_size * min(old_rows, new_rows); - - update_attr(vc); - -@@ -3075,8 +3069,7 @@ static int bind_con_driver(const struct - - old_was_color = vc->vc_can_do_color; - vc->vc_sw->con_deinit(vc); -- if (!vc->vc_origin) -- vc->vc_origin = (unsigned long)vc->vc_screenbuf; -+ vc->vc_origin = (unsigned long)vc->vc_screenbuf; - visual_init(vc, i, 0); - set_origin(vc); - update_attr(vc); diff --git a/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch b/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch deleted file mode 100644 index 6930f5143cdf04..00000000000000 --- a/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch +++ /dev/null @@ -1,91 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Sep 1 13:02:44 2010 -From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> -To: linux-usb@vger.kernel.org -Cc: linux-kernel@vger.kernel.org, - Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>, - Alan Stern <stern@rowland.harvard.edu>, - Sarah Sharp <sarah.a.sharp@linux.intel.com>, - Greg Kroah-Hartman <gregkh@suse.de> -Subject: usb: allow drivers to use allocated bandwidth until unbound -Date: Sat, 28 Aug 2010 03:06:29 -0300 -Message-Id: <1282975589-22324-1-git-send-email-cascardo@holoscopio.com> - -When using the remove sysfs file, the device configuration is set to -1 -(unconfigured). This eventually unbind drivers with the bandwidth_mutex -held. Some drivers may call functions that hold said mutex, like -usb_reset_device. This is the case for rtl8187, for example. This will -lead to the same process holding the mutex twice, which deadlocks. - -Besides, according to Alan Stern: -"The deadlock problem probably could be handled somehow, but there's a -separate issue: Until the usb_disable_device call finishes unbinding -the drivers, the drivers are free to continue using their allocated -bandwidth. We musn't change the bandwidth allocations until after the -unbinding is done. So this patch is indeed necessary." - -Unbinding the driver before holding the bandwidth_mutex solves the -problem. If any operation after that fails, drivers are not bound again. -But that would be a problem anyway that the user may solve resetting the -device configuration to one that works, just like he would need to do in -most other failure cases. - -Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> -Cc: Alan Stern <stern@rowland.harvard.edu> -Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/message.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - ---- a/drivers/usb/core/message.c -+++ b/drivers/usb/core/message.c -@@ -1724,6 +1724,15 @@ free_interfaces: - if (ret) - goto free_interfaces; - -+ /* if it's already configured, clear out old state first. -+ * getting rid of old interfaces means unbinding their drivers. -+ */ -+ if (dev->state != USB_STATE_ADDRESS) -+ usb_disable_device(dev, 1); /* Skip ep0 */ -+ -+ /* Get rid of pending async Set-Config requests for this device */ -+ cancel_async_set_config(dev); -+ - /* Make sure we have bandwidth (and available HCD resources) for this - * configuration. Remove endpoints from the schedule if we're dropping - * this configuration to set configuration 0. After this point, the -@@ -1733,20 +1742,11 @@ free_interfaces: - mutex_lock(&hcd->bandwidth_mutex); - ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL); - if (ret < 0) { -- usb_autosuspend_device(dev); - mutex_unlock(&hcd->bandwidth_mutex); -+ usb_autosuspend_device(dev); - goto free_interfaces; - } - -- /* if it's already configured, clear out old state first. -- * getting rid of old interfaces means unbinding their drivers. -- */ -- if (dev->state != USB_STATE_ADDRESS) -- usb_disable_device(dev, 1); /* Skip ep0 */ -- -- /* Get rid of pending async Set-Config requests for this device */ -- cancel_async_set_config(dev); -- - ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), - USB_REQ_SET_CONFIGURATION, 0, configuration, 0, - NULL, 0, USB_CTRL_SET_TIMEOUT); -@@ -1761,8 +1761,8 @@ free_interfaces: - if (!cp) { - usb_set_device_state(dev, USB_STATE_ADDRESS); - usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL); -- usb_autosuspend_device(dev); - mutex_unlock(&hcd->bandwidth_mutex); -+ usb_autosuspend_device(dev); - goto free_interfaces; - } - mutex_unlock(&hcd->bandwidth_mutex); diff --git a/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch b/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch deleted file mode 100644 index 812dd12c87b6cc..00000000000000 --- a/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch +++ /dev/null @@ -1,37 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Sep 1 18:10:45 2010 -Date: Tue, 31 Aug 2010 19:31:32 +0200 -Message-ID: <AANLkTinezH-sqVzfzCZ8qjXrmaDXuwBRvRWYSN2Jw72+@mail.gmail.com> -Subject: USB: cdc-acm: Add pseudo modem without AT command capabilities -From: Philippe Corbes <philippe.corbes@gmail.com> -To: linux-usb@vger.kernel.org - -From: Philippe Corbes <philippe.corbes@gmail.com> - -cdc-acm.c : Manage pseudo-modem without AT commands capabilities - Enable to drive electronic simple gadgets based on microcontrolers. - The Interface descriptor is like this: - bInterfaceClass 2 Communications - bInterfaceSubClass 2 Abstract (modem) - bInterfaceProtocol 0 None - -Signed-off-by: Philippe Corbes <philippe.corbes@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/cdc-acm.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -1615,6 +1615,10 @@ static const struct usb_device_id acm_id - .driver_info = NOT_A_MODEM, - }, - -+ /* control interfaces without any protocol set */ -+ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, -+ USB_CDC_PROTO_NONE) }, -+ - /* control interfaces with various AT-command sets */ - { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, - USB_CDC_ACM_PROTO_AT_V25TER) }, diff --git a/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch b/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch deleted file mode 100644 index 85054c7895039b..00000000000000 --- a/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch +++ /dev/null @@ -1,68 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Sep 1 15:40:58 2010 -From: Toby Gray <toby.gray@realvnc.com> -To: Oliver Neukum <oliver@neukum.name> -Cc: linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com> -Subject: USB: cdc-acm: Adding second ACM channel support for various Nokia and one Samsung phones -Date: Wed, 1 Sep 2010 16:01:19 +0100 -Message-Id: <1283353279-18679-1-git-send-email-toby.gray@realvnc.com> - -S60 phones from Nokia and Samsung expose two ACM channels. The first is a modem -with a standard AT-command interface, which is picked up correctly by CDC-ACM. - -The second ACM port is marked as having a vendor-specific protocol. This means -that the ACM driver will not claim the second channel by default. - -This adds support for the second ACM channel for the following devices: - Nokia E63 - Nokia E75 - Nokia 6760 Slide - Nokia E52 - Nokia E55 - Nokia E72 - Nokia X6 - Nokia N97 Mini - Nokia 5800 Xpressmusic - Nokia E90 - Samsung GTi8510 (INNOV8) - -Signed-off-by: Toby Gray <toby.gray@realvnc.com> -Cc: Oliver Neukum <oliver@neukum.name> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/cdc-acm.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -1481,6 +1481,11 @@ static int acm_reset_resume(struct usb_i - USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \ - USB_CDC_ACM_PROTO_VENDOR) - -+#define SAMSUNG_PCSUITE_ACM_INFO(x) \ -+ USB_DEVICE_AND_INTERFACE_INFO(0x04e7, x, \ -+ USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \ -+ USB_CDC_ACM_PROTO_VENDOR) -+ - /* - * USB driver structure. - */ -@@ -1591,6 +1596,17 @@ static const struct usb_device_id acm_id - { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */ - { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */ - { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x0178), }, /* Nokia E63 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x010e), }, /* Nokia E75 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x02d9), }, /* Nokia 6760 Slide */ -+ { NOKIA_PCSUITE_ACM_INFO(0x01d0), }, /* Nokia E52 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x0223), }, /* Nokia E72 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x0275), }, /* Nokia X6 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x026c), }, /* Nokia N97 Mini */ -+ { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */ -+ { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */ -+ { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */ -+ { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */ - - /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ - diff --git a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch deleted file mode 100644 index 48c80391d2dc16..00000000000000 --- a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch +++ /dev/null @@ -1,40 +0,0 @@ -From toby.gray@realvnc.com Thu Sep 2 13:02:31 2010 -From: Toby Gray <toby.gray@realvnc.com> -To: Oliver Neukum <oliver@neukum.name> -Cc: Greg Kroah-Hartman <gregkh@suse.de>, stable@kernel.org, - linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com> -Subject: USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors. -Date: Thu, 2 Sep 2010 10:46:20 +0100 -Message-Id: <1283420780-13510-1-git-send-email-toby.gray@realvnc.com> - -Certain USB devices, such as the Nokia X6 mobile phone, don't expose any -endpoint descriptors on some of their interfaces. If the ACM driver is forced -to probe all interfaces on a device the a NULL pointer dereference will occur -when the ACM driver attempts to use the endpoint of the alternative settings. -One way to get the ACM driver to probe all the interfaces is by using the -/sys/bus/usb/drivers/cdc_acm/new_id interface. - -This patch checks that the endpoint pointer for the current alternate settings -is non-NULL before using it. - -Signed-off-by: Toby Gray <toby.gray@realvnc.com> -Cc: Oliver Neukum <oliver@neukum.name> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/cdc-acm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interfac - } - - if (!buflen) { -- if (intf->cur_altsetting->endpoint->extralen && -+ if (intf->cur_altsetting->endpoint && -+ intf->cur_altsetting->endpoint->extralen && - intf->cur_altsetting->endpoint->extra) { - dev_dbg(&intf->dev, - "Seeking extra descriptors on endpoint\n"); diff --git a/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch b/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch deleted file mode 100644 index 797046e959812f..00000000000000 --- a/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch +++ /dev/null @@ -1,29 +0,0 @@ -From jason.detring@navico.com Wed Sep 1 13:00:21 2010 -From: Jason Detring <jason.detring@navico.com> -To: linux-usb@vger.kernel.org -Cc: gregkh@suse.de, Jason Detring <jason.detring@navico.com> -Subject: USB: cp210x: Add B&G H3000 link cable ID -Date: Thu, 26 Aug 2010 15:08:54 -0500 -Message-Id: <1282853334-27956-2-git-send-email-jason.detring@navico.com> - -This is the cable between an H3000 navigation unit and a multi-function display. -http://www.bandg.com/en/Products/H3000/Spares-and-Accessories/Cables/H3000-CPU-USB-Cable-Pack/ - -Signed-off-by: Jason Detring <jason.detring@navico.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -88,6 +88,7 @@ static const struct usb_device_id id_tab - { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */ - { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ - { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ -+ { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */ - { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ - { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ - { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ diff --git a/usb.current/usb-cp210x-add-new-device-id.patch b/usb.current/usb-cp210x-add-new-device-id.patch deleted file mode 100644 index 1056a7be75223c..00000000000000 --- a/usb.current/usb-cp210x-add-new-device-id.patch +++ /dev/null @@ -1,47 +0,0 @@ -From craig@microtron.org.uk Wed Sep 1 12:59:47 2010 -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org -Message-Id: <1282596415287486343@teratron> -From: Craig Shelley <craig@microtron.org.uk> -Date: Mon, 23 Aug 2010 20:50:57 +0100 -Subject: USB: CP210x Add new device ID - -New device ID added for Balluff RFID reader. - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -109,6 +109,7 @@ static const struct usb_device_id id_tab - { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */ - { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */ - { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ -+ { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */ - { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */ -@@ -122,14 +123,14 @@ static const struct usb_device_id id_tab - { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ - { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ - { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ -- { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ -- { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ -- { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ -- { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ - { USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */ - { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */ - { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */ - { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */ -+ { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ -+ { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ -+ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ -+ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ - { } /* Terminating Entry */ - }; - diff --git a/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch b/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch deleted file mode 100644 index c3a79e9546e8c2..00000000000000 --- a/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch +++ /dev/null @@ -1,75 +0,0 @@ -From law_ence.dev@ntlworld.com Wed Sep 1 13:00:40 2010 -Date: Sun, 29 Aug 2010 21:51:52 +0100 -From: ael <law_ence.dev@ntlworld.com> -To: greg@kroah.com, linux-usb@vger.kernel.org -Subject: USB: cp210x usb driver: add USB_DEVICE for Pirelli DP-L10 mobile. -Message-ID: <20100829205152.GB3157@exact.conquest> -Content-Disposition: inline - -From: A E Lawrence <lawrence_a_e@ntlworld.com> - -The Pirelli DP-L10 mobile is sold under various brand names. One, already -supported by cp210x, is the T-COM TC300. Here is the lsusb for that version: -------------------------------------------------------------------- -Bus 001 Device 002: ID 0489:e000 Foxconn / Hon Hai T-Com TC 300 -Device Descriptor: - bLength 18 - bDescriptorType 1 - bcdUSB 1.10 - bDeviceClass 0 (Defined at Interface level) - bDeviceSubClass 0 - bDeviceProtocol 0 - bMaxPacketSize0 64 - idVendor 0x0489 Foxconn / Hon Hai - idProduct 0xe000 T-Com TC 300 - bcdDevice 1.00 - iManufacturer 1 Silicon Labs - iProduct 2 TC 300 - iSerial 3 0001 - [snip] ---------------------------------------------------------------------------- - -However the native Pirelli DP-L10 is not supported: ------------------------------------------------------------------- -Bus 001 Device 003: ID 0489:e003 Foxconn / Hon Hai Pirelli DP-L10 -Device Descriptor: - bLength 18 - bDescriptorType 1 - bcdUSB 1.10 - bDeviceClass 0 (Defined at Interface level) - bDeviceSubClass 0 - bDeviceProtocol 0 - bMaxPacketSize0 64 - idVendor 0x0489 Foxconn / Hon Hai - idProduct 0xe003 Pirelli DP-L10 - bcdDevice 1.00 - iManufacturer 1 Silicon Labs - iProduct 2 DP-L10 - iSerial 3 0001 - [snip] -------------------------------------------------------------------------- - -All that is required is an extra USB_DEVICE entry: - -{ USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM -+Mobile */ - -The patch adds that entry. Tested under 2.6.36-rc2 from git. - -Signed-off-by: A E Lawrence <lawrence_a_e@ntlworld.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -56,6 +56,7 @@ static int debug; - static const struct usb_device_id id_table[] = { - { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ - { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ -+ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ - { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ - { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ - { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ diff --git a/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch b/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch deleted file mode 100644 index 9aeeb8f2fc454a..00000000000000 --- a/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch +++ /dev/null @@ -1,72 +0,0 @@ -From simon@fire.lp0.eu Wed Sep 1 15:45:04 2010 -Message-ID: <4C7E8F48.3020501@simon.arlott.org.uk> -Date: Wed, 01 Sep 2010 18:37:12 +0100 -From: Simon Arlott <simon@fire.lp0.eu> -To: Greg KH <greg@kroah.com> -Subject: USB: cxacru: Use a bulk/int URB to access the command endpoint - -The command endpoint is either a bulk or interrupt endpoint, but using -the wrong type of transfer causes an error if CONFIG_USB_DEBUG is -enabled after commit f661c6f8c67bd55e93348f160d590ff9edf08904, which -checks for this mismatch. - -Detect which type of endpoint it is and use a bulk/int URB as -appropriate. There are other function calls specifying a bulk pipe, -but usb_clear_halt doesn't use the pipe type (only the endpoint) and -usb_bulk_msg auto-detects interrupt transfers. - -Signed-off-by: Simon Arlott <simon@fire.lp0.eu> -Cc: stable <stable@kernel.org> [.34 and newer] -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/atm/cxacru.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - ---- a/drivers/usb/atm/cxacru.c -+++ b/drivers/usb/atm/cxacru.c -@@ -1127,6 +1127,7 @@ static int cxacru_bind(struct usbatm_dat - { - struct cxacru_data *instance; - struct usb_device *usb_dev = interface_to_usbdev(intf); -+ struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD]; - int ret; - - /* instance init */ -@@ -1171,15 +1172,34 @@ static int cxacru_bind(struct usbatm_dat - goto fail; - } - -- usb_fill_int_urb(instance->rcv_urb, -+ if (!cmd_ep) { -+ dbg("cxacru_bind: no command endpoint"); -+ ret = -ENODEV; -+ goto fail; -+ } -+ -+ if ((cmd_ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) -+ == USB_ENDPOINT_XFER_INT) { -+ usb_fill_int_urb(instance->rcv_urb, - usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD), - instance->rcv_buf, PAGE_SIZE, - cxacru_blocking_completion, &instance->rcv_done, 1); - -- usb_fill_int_urb(instance->snd_urb, -+ usb_fill_int_urb(instance->snd_urb, - usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD), - instance->snd_buf, PAGE_SIZE, - cxacru_blocking_completion, &instance->snd_done, 4); -+ } else { -+ usb_fill_bulk_urb(instance->rcv_urb, -+ usb_dev, usb_rcvbulkpipe(usb_dev, CXACRU_EP_CMD), -+ instance->rcv_buf, PAGE_SIZE, -+ cxacru_blocking_completion, &instance->rcv_done); -+ -+ usb_fill_bulk_urb(instance->snd_urb, -+ usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD), -+ instance->snd_buf, PAGE_SIZE, -+ cxacru_blocking_completion, &instance->snd_done); -+ } - - mutex_init(&instance->cm_serialize); - diff --git a/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch b/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch deleted file mode 100644 index 045db42a9f1fcb..00000000000000 --- a/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch +++ /dev/null @@ -1,60 +0,0 @@ -From error27@gmail.com Wed Sep 1 12:41:29 2010 -Date: Sat, 14 Aug 2010 11:06:19 +0200 -From: Dan Carpenter <error27@gmail.com> -To: David Brownell <dbrownell@users.sourceforge.net> -Cc: Greg Kroah-Hartman <gregkh@suse.de>, - Grant Likely <grant.likely@secretlab.ca>, - Sean MacLennan <smaclennan@pikatech.com>, - "David S. Miller" <davem@davemloft.net>, linux-usb@vger.kernel.org, - devicetree-discuss@lists.ozlabs.org, - Vitaly Bordug <vitb@kernel.crashing.org>, - kernel-janitors@vger.kernel.org -Subject: USB: ehci-ppc-of: problems in unwind -Message-ID: <20100814090619.GY645@bicker> -Content-Disposition: inline - -The iounmap(ehci->ohci_hcctrl_reg); should be the first thing we do -because the ioremap() was the last thing we did. Also if we hit any of -the goto statements in the original code then it would have led to a -NULL dereference of "ehci". This bug was introduced in: 796bcae7361c -"USB: powerpc: Workaround for the PPC440EPX USBH_23 errata [take 3]" - -I modified the few lines in front a little so that my code didn't -obscure the return success code path. - -Signed-off-by: Dan Carpenter <error27@gmail.com> -Reviewed-by: Grant Likely <grant.likely@secretlab.ca> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-ppc-of.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - ---- a/drivers/usb/host/ehci-ppc-of.c -+++ b/drivers/usb/host/ehci-ppc-of.c -@@ -192,17 +192,19 @@ ehci_hcd_ppc_of_probe(struct platform_de - } - - rv = usb_add_hcd(hcd, irq, 0); -- if (rv == 0) -- return 0; -+ if (rv) -+ goto err_ehci; - -+ return 0; -+ -+err_ehci: -+ if (ehci->has_amcc_usb23) -+ iounmap(ehci->ohci_hcctrl_reg); - iounmap(hcd->regs); - err_ioremap: - irq_dispose_mapping(irq); - err_irq: - release_mem_region(hcd->rsrc_start, hcd->rsrc_len); -- -- if (ehci->has_amcc_usb23) -- iounmap(ehci->ohci_hcctrl_reg); - err_rmr: - usb_put_hcd(hcd); - diff --git a/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch b/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch deleted file mode 100644 index f4e0712bdef55a..00000000000000 --- a/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch +++ /dev/null @@ -1,42 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Sep 1 12:45:40 2010 -Date: Sat, 21 Aug 2010 14:54:06 +0400 -Message-ID: <AANLkTinKBYzMwxEJarwN_HmKAORqJ7oiauj5JuXCo+rm@mail.gmail.com> -Subject: USB: Fix kernel oops with g_ether and Windows -From: Maxim Osipov <maxim.osipov@gmail.com> -To: David Brownell <dbrownell@users.sourceforge.net>, - Greg Kroah-Hartman <gregkh@suse.de>, - Maxim Osipov <maxim.osipov@gmail.com>, - linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org - - -Please find attached patch for -https://bugzilla.kernel.org/show_bug.cgi?id=16023 problem. - - -Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/rndis.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/drivers/usb/gadget/rndis.c -+++ b/drivers/usb/gadget/rndis.c -@@ -293,9 +293,13 @@ gen_ndis_query_resp (int configNr, u32 O - /* mandatory */ - case OID_GEN_VENDOR_DESCRIPTION: - pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__); -- length = strlen (rndis_per_dev_params [configNr].vendorDescr); -- memcpy (outbuf, -- rndis_per_dev_params [configNr].vendorDescr, length); -+ if ( rndis_per_dev_params [configNr].vendorDescr ) { -+ length = strlen (rndis_per_dev_params [configNr].vendorDescr); -+ memcpy (outbuf, -+ rndis_per_dev_params [configNr].vendorDescr, length); -+ } else { -+ outbuf[0] = 0; -+ } - retval = 0; - break; - diff --git a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch deleted file mode 100644 index 3b9ea5d45e268f..00000000000000 --- a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch +++ /dev/null @@ -1,58 +0,0 @@ -From luke@chamsys.co.uk Thu Sep 2 13:03:00 2010 -From: Luke Lowrey <luke@chamsys.co.uk> -To: gregkh@suse.de -Cc: jhovold@gmail.com, andi@lisas.de, linux-usb@vger.kernel.org, - linux-kernel@vger.kernel.org, Luke Lowrey <luke@chamsys.co.uk> -Subject: USB: ftdi_sio: Added custom PIDs for ChamSys products -Date: Thu, 2 Sep 2010 11:39:49 +0100 -Message-Id: <1283423989-5710-1-git-send-email-luke@chamsys.co.uk> - -Added the 0xDAF8 to 0xDAFF PID range for ChamSys limited USB interface/wing products - -Signed-off-by: Luke Lowrey <luke@chamsys.co.uk> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 8 ++++++++ - drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++++++++ - 2 files changed, 20 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -753,6 +753,14 @@ static struct usb_device_id id_table_com - { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) }, - { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID), - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MIDI_TIMECODE_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MINI_WING_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio_ids.h -+++ b/drivers/usb/serial/ftdi_sio_ids.h -@@ -135,6 +135,18 @@ - #define FTDI_NDI_AURORA_SCU_PID 0xDA74 /* NDI Aurora SCU */ - - /* -+ * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs -+ */ -+#define FTDI_CHAMSYS_24_MASTER_WING_PID 0xDAF8 -+#define FTDI_CHAMSYS_PC_WING_PID 0xDAF9 -+#define FTDI_CHAMSYS_USB_DMX_PID 0xDAFA -+#define FTDI_CHAMSYS_MIDI_TIMECODE_PID 0xDAFB -+#define FTDI_CHAMSYS_MINI_WING_PID 0xDAFC -+#define FTDI_CHAMSYS_MAXI_WING_PID 0xDAFD -+#define FTDI_CHAMSYS_MEDIA_WING_PID 0xDAFE -+#define FTDI_CHAMSYS_WING_PID 0xDAFF -+ -+/* - * Westrex International devices submitted by Cory Lee - */ - #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */ diff --git a/usb.current/usb-option-fix-incorrect-novatel-entries.patch b/usb.current/usb-option-fix-incorrect-novatel-entries.patch deleted file mode 100644 index 06d2af208f29e1..00000000000000 --- a/usb.current/usb-option-fix-incorrect-novatel-entries.patch +++ /dev/null @@ -1,172 +0,0 @@ -From ddeschepper@nvtl.com Wed Sep 1 12:50:22 2010 -Subject: USB: option: fix incorrect novatel entries -Date: Tue, 24 Aug 2010 20:38:35 +0100 -From: "Dirk De Schepper" <ddeschepper@nvtl.com> -To: gregkh@suse.de -Message-ID: <B29F014DE7B1F949B0BC4C1EBCF29DD67B0ECB@Vectra.nvtl.local> - -Unfortunately some of the hardware PID belonging to auto-install CDROM -(AICD) of Novatel modems found their way into the option module. This -causes the AICD to be treated as a modem in stead of a disk. Since the -modem ports do not appear until after the AICD is ejected, this -essentially disables the modem. After a couple of minutes the AICD -should auto-eject, but it is just too long a wait. The frequency of the -failure seems to depend on both the hardware and the linux distribution. - -Here is a patch that fixes this up, and also adds a couple of new PID, -offering some explanations and removing some incomplete and unnecessary -comments. - -Signed-off-by: Dirk De Schepper <ddeschepper@nvtl.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 119 +++++++++++++++++++++++++++----------------- - 1 file changed, 75 insertions(+), 44 deletions(-) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -164,6 +164,14 @@ static void option_instat_callback(struc - #define YISO_VENDOR_ID 0x0EAB - #define YISO_PRODUCT_U893 0xC893 - -+/* -+ * NOVATEL WIRELESS PRODUCTS -+ * -+ * Note from Novatel Wireless: -+ * If your Novatel modem does not work on linux, don't -+ * change the option module, but check our website. If -+ * that does not help, contact ddeschepper@nvtl.com -+*/ - /* MERLIN EVDO PRODUCTS */ - #define NOVATELWIRELESS_PRODUCT_V640 0x1100 - #define NOVATELWIRELESS_PRODUCT_V620 0x1110 -@@ -185,24 +193,39 @@ static void option_instat_callback(struc - #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 --#define NOVATELWIRELESS_PRODUCT_U727 0x5010 --#define NOVATELWIRELESS_PRODUCT_MC727_NEW 0x5100 --#define NOVATELWIRELESS_PRODUCT_MC760 0x6000 -+/* -+ * Note from Novatel Wireless: -+ * All PID in the 5xxx range are currently reserved for -+ * auto-install CDROMs, and should not be added to this -+ * module. -+ * -+ * #define NOVATELWIRELESS_PRODUCT_U727 0x5010 -+ * #define NOVATELWIRELESS_PRODUCT_MC727_NEW 0x5100 -+*/ - #define NOVATELWIRELESS_PRODUCT_OVMC760 0x6002 -- --/* FUTURE NOVATEL PRODUCTS */ --#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0X6001 --#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0X7000 --#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0X7001 --#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000 --#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001 --#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000 --#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001 --#define NOVATELWIRELESS_PRODUCT_GLOBAL 0XA001 -+#define NOVATELWIRELESS_PRODUCT_MC780 0x6010 -+#define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0x6000 -+#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0x6001 -+#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0x7000 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0x7001 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3 0x7003 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4 0x7004 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5 0x7005 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED6 0x7006 -+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED7 0x7007 -+#define NOVATELWIRELESS_PRODUCT_MC996D 0x7030 -+#define NOVATELWIRELESS_PRODUCT_MF3470 0x7041 -+#define NOVATELWIRELESS_PRODUCT_MC547 0x7042 -+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0x8000 -+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0x8001 -+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000 -+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001 -+#define NOVATELWIRELESS_PRODUCT_G1 0xA001 -+#define NOVATELWIRELESS_PRODUCT_G1_M 0xA002 -+#define NOVATELWIRELESS_PRODUCT_G2 0xA010 - - /* AMOI PRODUCTS */ - #define AMOI_VENDOR_ID 0x1614 -@@ -490,36 +513,44 @@ static const struct usb_device_id option - { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, - { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, -- { 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, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */ -- { 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, NOVATELWIRELESS_PRODUCT_MC727_NEW) }, /* Novatel MC727/U727/USB727 refresh */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC760) }, /* Novatel MC760/U760/USB760 */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) }, /* Novatel Ovation MC760 */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */ -- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */ -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC780) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED6) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED7) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC996D) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MF3470) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) }, -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) }, - - { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, - { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) }, diff --git a/usb.current/usb-rndis-section-mismatch-fix.patch b/usb.current/usb-rndis-section-mismatch-fix.patch deleted file mode 100644 index 892b655ff42ac2..00000000000000 --- a/usb.current/usb-rndis-section-mismatch-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From henne@nachtwindheim.de Wed Sep 1 12:44:37 2010 -From: Henrik Kretzschmar <henne@nachtwindheim.de> -To: dbrownell@users.sourceforge.net -Cc: gregkh@suse.de, davem@davemloft.net, eric.dumazet@gmail.com, - henne@nachtwindheim.de, tj@kernel.org, bniebuhr@efjohnson.com, - linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: USB: rndis: section mismatch fix -Date: Fri, 20 Aug 2010 19:57:50 +0200 -Message-Id: <1282327070-5100-1-git-send-email-henne@nachtwindheim.de> - -This patch removes the following section mismatch warning, -by moving the function rndis_init() from .init.text to .text. - -WARNING: vmlinux.o(.text+0x1aeca5a): Section mismatch in reference from the function rndis_bind_config() to the function .init.text:rndis_init() -The function rndis_bind_config() references -the function __init rndis_init(). -This is often because rndis_bind_config lacks a __init -annotation or the annotation of rndis_init is wrong. - -Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/rndis.c | 2 +- - drivers/usb/gadget/rndis.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/gadget/rndis.c -+++ b/drivers/usb/gadget/rndis.c -@@ -1148,7 +1148,7 @@ static struct proc_dir_entry *rndis_conn - #endif /* CONFIG_USB_GADGET_DEBUG_FILES */ - - --int __init rndis_init (void) -+int rndis_init(void) - { - u8 i; - ---- a/drivers/usb/gadget/rndis.h -+++ b/drivers/usb/gadget/rndis.h -@@ -262,7 +262,7 @@ int rndis_signal_disconnect (int config - int rndis_state (int configNr); - extern void rndis_set_host_mac (int configNr, const u8 *addr); - --int __devinit rndis_init (void); -+int rndis_init(void); - void rndis_exit (void); - - #endif /* _LINUX_RNDIS_H */ diff --git a/usb.current/usb-s3c-hsotg-remove-debug-define.patch b/usb.current/usb-s3c-hsotg-remove-debug-define.patch deleted file mode 100644 index 79a2a4ede123d5..00000000000000 --- a/usb.current/usb-s3c-hsotg-remove-debug-define.patch +++ /dev/null @@ -1,29 +0,0 @@ -From mcuelenaere@gmail.com Wed Sep 1 12:41:09 2010 -Message-ID: <4c659d1c.487e0e0a.037b.ffffcf6a@mx.google.com> -Date: Fri, 13 Aug 2010 21:29:30 +0200 -From: Maurus Cuelenaere <mcuelenaere@gmail.com> -Subject: USB: s3c-hsotg: Remove DEBUG define -To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org -Cc: ben-linux@fluff.org, dbrownell@users.sourceforge.net, - gregkh@suse.de - -DEBUG is defined unconditionally, remove it as this clutters the message log. - -Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/s3c-hsotg.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/usb/gadget/s3c-hsotg.c -+++ b/drivers/usb/gadget/s3c-hsotg.c -@@ -12,8 +12,6 @@ - * published by the Free Software Foundation. - */ - --#define DEBUG -- - #include <linux/kernel.h> - #include <linux/module.h> - #include <linux/spinlock.h> diff --git a/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch b/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch deleted file mode 100644 index 7aea088c251c8b..00000000000000 --- a/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dave.ludlow@bay.ws Wed Sep 1 15:40:28 2010 -From: Dave Ludlow <dave.ludlow@bay.ws> -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, - Dave Ludlow <dave.ludlow@bay.ws> -Subject: usb: serial: mos7840: Add USB ID to support the B&B Electronics USOPTL4-2P. -Date: Tue, 31 Aug 2010 14:26:17 -0400 -Message-Id: <1283279177-14379-1-git-send-email-dave.ludlow@bay.ws> - -Add the USB ID needed to support B&B Electronic's 2-port, optically-isolated, -powered, USB to RS485 converter. - -Signed-off-by: Dave Ludlow <dave.ludlow@bay.ws> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/mos7840.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/usb/serial/mos7840.c -+++ b/drivers/usb/serial/mos7840.c -@@ -129,6 +129,7 @@ - #define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 - #define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 - #define BANDB_DEVICE_ID_USOPTL2_4 0xAC24 -+#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02 - - /* This driver also supports - * ATEN UC2324 device using Moschip MCS7840 -@@ -192,6 +193,7 @@ static const struct usb_device_id moschi - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, - {} /* terminating entry */ -@@ -209,6 +211,7 @@ static const struct usb_device_id moschi - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, - {} /* terminating entry */ diff --git a/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch b/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch deleted file mode 100644 index 1526f84314d9b9..00000000000000 --- a/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch +++ /dev/null @@ -1,95 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Sep 1 15:43:07 2010 -From: Dave Ludlow <dave.ludlow@bay.ws> -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, - Dave Ludlow <dave.ludlow@bay.ws> -Subject: usb: serial: mos7840: Add USB IDs to support more B&B USB/RS485 converters. -Date: Wed, 1 Sep 2010 12:33:30 -0400 -Message-Id: <1283358810-9702-1-git-send-email-dave.ludlow@bay.ws> - -Add the USB IDs needed to support the B&B USOPTL4-4P, USO9ML2-2P, and -USO9ML2-4P. This patch expands and corrects a typo in the patch sent -on 08-31-2010. - -Signed-off-by: Dave Ludlow <dave.ludlow@bay.ws> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/mos7840.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - ---- a/drivers/usb/serial/mos7840.c -+++ b/drivers/usb/serial/mos7840.c -@@ -119,17 +119,20 @@ - * by making a change here, in moschip_port_id_table, and in - * moschip_id_table_combined - */ --#define USB_VENDOR_ID_BANDB 0x0856 --#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22 --#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24 --#define BANDB_DEVICE_ID_US9ML2_2 0xAC29 --#define BANDB_DEVICE_ID_US9ML2_4 0xAC30 --#define BANDB_DEVICE_ID_USPTL4_2 0xAC31 --#define BANDB_DEVICE_ID_USPTL4_4 0xAC32 --#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 --#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 --#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24 --#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02 -+#define USB_VENDOR_ID_BANDB 0x0856 -+#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22 -+#define BANDB_DEVICE_ID_USO9ML2_2P 0xBC00 -+#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24 -+#define BANDB_DEVICE_ID_USO9ML2_4P 0xBC01 -+#define BANDB_DEVICE_ID_US9ML2_2 0xAC29 -+#define BANDB_DEVICE_ID_US9ML2_4 0xAC30 -+#define BANDB_DEVICE_ID_USPTL4_2 0xAC31 -+#define BANDB_DEVICE_ID_USPTL4_4 0xAC32 -+#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 -+#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02 -+#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 -+#define BANDB_DEVICE_ID_USOPTL4_4P 0xBC03 -+#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24 - - /* This driver also supports - * ATEN UC2324 device using Moschip MCS7840 -@@ -185,15 +188,18 @@ static const struct usb_device_id moschi - {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)}, - {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, -- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, - {} /* terminating entry */ -@@ -203,15 +209,18 @@ static const struct usb_device_id moschi - {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)}, - {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, -+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)}, - {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)}, -- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, - {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)}, - {} /* terminating entry */ diff --git a/usb.current/usb-ssu100-turn-off-debug-flag.patch b/usb.current/usb-ssu100-turn-off-debug-flag.patch deleted file mode 100644 index 64aea33b845cf6..00000000000000 --- a/usb.current/usb-ssu100-turn-off-debug-flag.patch +++ /dev/null @@ -1,27 +0,0 @@ -From wfp5p@viridian.itc.virginia.edu Wed Sep 1 13:03:28 2010 -From: Bill Pemberton <wfp5p@virginia.edu> -To: greg@kroah.com -Subject: USB: ssu100: turn off debug flag -Date: Wed, 25 Aug 2010 18:21:23 -0400 -Message-Id: <1282774883-26018-1-git-send-email-wfp5p@virginia.edu> - -Remove the hard coding of the debug flag to 1. - -Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ssu100.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/serial/ssu100.c -+++ b/drivers/usb/serial/ssu100.c -@@ -46,7 +46,7 @@ - #define FULLPWRBIT 0x00000080 - #define NEXT_BOARD_POWER_BIT 0x00000004 - --static int debug = 1; -+static int debug; - - /* Version Information */ - #define DRIVER_VERSION "v0.1" diff --git a/usb/usb-sam-ba-add-driver-for-atmel-sam-boot-assistant-sam-ba.patch b/usb/usb-sam-ba-add-driver-for-atmel-sam-boot-assistant-sam-ba.patch index ac26d9bb5beca8..3a6c01085966c8 100644 --- a/usb/usb-sam-ba-add-driver-for-atmel-sam-boot-assistant-sam-ba.patch +++ b/usb/usb-sam-ba-add-driver-for-atmel-sam-boot-assistant-sam-ba.patch @@ -18,6 +18,7 @@ the generic write implementation (which uses the port write fifo). Tested with the SAM-BA 2.10 tools and an Atmel at91sam9260-ek. Signed-off-by: Johan Hovold <jhovold@gmail.com> +Tested-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- |