diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-14 15:36:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-14 15:36:41 -0700 |
| commit | 19d1c28b2eb7a1b43421fc5d47d0e35bc50a6bf0 (patch) | |
| tree | 5a8554bd3c9f0e35368c74b365ed556addfebee2 | |
| parent | c3a1ad71645c598cd5f7bfe56f395de7de59529c (diff) | |
| download | patches-19d1c28b2eb7a1b43421fc5d47d0e35bc50a6bf0.tar.gz | |
more fun
| -rw-r--r-- | series | 3 | ||||
| -rw-r--r-- | staging/staging-line6-ffzb-returns-an-unsigned-integer.patch | 39 | ||||
| -rw-r--r-- | staging/staging-line6-pod.c-style-cleanups.patch | 49 | ||||
| -rw-r--r-- | tty/tty-usb-drop-filp-argp | 4 | ||||
| -rw-r--r-- | usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch | 43 |
5 files changed, 136 insertions, 2 deletions
@@ -32,6 +32,7 @@ usb.current/usb-cdc-wdm-driver-doesn-t-support-non-blocking-reads.patch usb.current/usb-fix-cdc-acm-regression-in-open.patch usb.current/usb-add-pids-for-ftdi-based-opendcc-hardware.patch usb.current/usb-sl811-hcd-fix-device-disconnect.patch +usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch usb.current/usb-xhci-work-around-for-chain-bit-in-link-trbs.patch usb.current/usb-xhci-fix-slot-and-endpoint-context-debugging.patch @@ -976,6 +977,8 @@ staging/staging-dream-fix-build-errors.patch staging/staging-comedi-addi-data-null-dereference-of-amcc-in-v_pci_card_list_init.patch staging/staging-dream-introduce-missing-kfree.patch staging/staging-iio-introduce-missing-kfree.patch +staging/staging-line6-pod.c-style-cleanups.patch +staging/staging-line6-ffzb-returns-an-unsigned-integer.patch # remove a bunch of drivers staging/staging-remove-me4000-driver.patch diff --git a/staging/staging-line6-ffzb-returns-an-unsigned-integer.patch b/staging/staging-line6-ffzb-returns-an-unsigned-integer.patch new file mode 100644 index 00000000000000..341bd1f03dfc9f --- /dev/null +++ b/staging/staging-line6-ffzb-returns-an-unsigned-integer.patch @@ -0,0 +1,39 @@ +From frederik.deweerdt@xprog.eu Mon Sep 14 15:18:46 2009 +From: Frederik Deweerdt <frederik.deweerdt@xprog.eu> +Date: Mon, 14 Sep 2009 08:52:37 +0000 +Subject: Staging: line6: ffzb returns an unsigned integer +To: greg@kroah.com +Message-ID: <20090914085237.GG3113@gambetta> +Content-Disposition: inline + + + +find_first_zero_bit returns a positive value, use it accordingly. + +Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/line6/capture.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/staging/line6/capture.c ++++ b/drivers/staging/line6/capture.c +@@ -26,7 +26,7 @@ + */ + static int submit_audio_in_urb(struct snd_pcm_substream *substream) + { +- int index; ++ unsigned int index; + unsigned long flags; + struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); + int i, urb_size; +@@ -35,7 +35,7 @@ static int submit_audio_in_urb(struct sn + spin_lock_irqsave(&line6pcm->lock_audio_in, flags); + index = find_first_zero_bit(&line6pcm->active_urb_in, LINE6_ISO_BUFFERS); + +- if (index < 0 || index >= LINE6_ISO_BUFFERS) { ++ if (index >= LINE6_ISO_BUFFERS) { + spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags); + dev_err(s2m(substream), "no free URB found\n"); + return -EINVAL; diff --git a/staging/staging-line6-pod.c-style-cleanups.patch b/staging/staging-line6-pod.c-style-cleanups.patch new file mode 100644 index 00000000000000..410ffca55657be --- /dev/null +++ b/staging/staging-line6-pod.c-style-cleanups.patch @@ -0,0 +1,49 @@ +From frederik.deweerdt@xprog.eu Mon Sep 14 15:18:31 2009 +From: Frederik Deweerdt <frederik.deweerdt@xprog.eu> +Date: Mon, 14 Sep 2009 08:51:38 +0000 +Subject: Staging: line6: pod.c: style cleanups +To: greg@kroah.com +Message-ID: <20090914085138.GF3113@gambetta> +Content-Disposition: inline + + +Line6 pod.c: Minor style cleanups + +Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/line6/pod.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/staging/line6/pod.c ++++ b/drivers/staging/line6/pod.c +@@ -123,7 +123,7 @@ static void pod_mark_batch_all_dirty(str + { + int i; + +- for (i = POD_CONTROL_SIZE; i--;) ++ for (i = 0; i < POD_CONTROL_SIZE; i++) + set_bit(i, pod->param_dirty); + } + +@@ -579,8 +579,8 @@ static ssize_t pod_set_dump(struct devic + + if (count != sizeof(pod->prog_data)) { + dev_err(pod->line6.ifcdev, +- "data block must be exactly %d bytes\n", +- (int)sizeof(pod->prog_data)); ++ "data block must be exactly %d bytes\n", ++ sizeof(pod->prog_data)); + return -EINVAL; + } + +@@ -692,7 +692,7 @@ static ssize_t pod_set_dump_buf(struct d + if (count != sizeof(pod->prog_data)) { + dev_err(pod->line6.ifcdev, + "data block must be exactly %d bytes\n", +- (int)sizeof(pod->prog_data)); ++ sizeof(pod->prog_data)); + return -EINVAL; + } + diff --git a/tty/tty-usb-drop-filp-argp b/tty/tty-usb-drop-filp-argp index 6b9a8dc09a0834..77fb122aa1af38 100644 --- a/tty/tty-usb-drop-filp-argp +++ b/tty/tty-usb-drop-filp-argp @@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> bytes_out = 0; --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -752,8 +752,7 @@ static int ftdi_sio_probe(struct usb_se +@@ -754,8 +754,7 @@ static int ftdi_sio_probe(struct usb_se const struct usb_device_id *id); static int ftdi_sio_port_probe(struct usb_serial_port *port); static int ftdi_sio_port_remove(struct usb_serial_port *port); @@ -259,7 +259,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void ftdi_close(struct usb_serial_port *port); static void ftdi_dtr_rts(struct usb_serial_port *port, int on); static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port, -@@ -1685,8 +1684,7 @@ static int ftdi_sio_port_remove(struct u +@@ -1687,8 +1686,7 @@ static int ftdi_sio_port_remove(struct u return 0; } diff --git a/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch b/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch new file mode 100644 index 00000000000000..0e24526226b495 --- /dev/null +++ b/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch @@ -0,0 +1,43 @@ +From vapier@gentoo.org Mon Sep 14 15:21:58 2009 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 14 Sep 2009 10:39:53 -0400 +Subject: USB: serial: ftdi: handle gnICE+ JTAG adaptors +To: Greg Kroah-Hartman <gregkh@suse.de> +Cc: linux-usb@vger.kernel.org, Greg Kroah-Hartman <gregkh@suse.de>, linux-kernel@vger.kernel.org, Michael Hennerich <michael.hennerich@analog.com> +Message-ID: <1252939193-29651-1-git-send-email-vapier@gentoo.org> + + +From: Michael Hennerich <michael.hennerich@analog.com> + +Detect the UART on interface1 and blacklist interface0 (as that is the +JTAG port). + +Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio.h | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -697,6 +697,8 @@ static struct usb_device_id id_table_com + { USB_DEVICE(DE_VID, WHT_PID) }, + { USB_DEVICE(ADI_VID, ADI_GNICE_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, + { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, +--- a/drivers/usb/serial/ftdi_sio.h ++++ b/drivers/usb/serial/ftdi_sio.h +@@ -933,6 +933,7 @@ + */ + #define ADI_VID 0x0456 + #define ADI_GNICE_PID 0xF000 ++#define ADI_GNICEPLUS_PID 0xF001 + + /* + * JETI SPECTROMETER SPECBOS 1201 |