3.0-stable patches

added patches:
	staging-usbip-changed-function-return-type-to-void.patch

diff --git a/queue-3.0/serial-8250-increase-pass_limit.patch b/queue-3.0/serial-8250-increase-pass_limit.patch
index 62fee243235c75be79b24e8dac68715481e5ec98..33b5d9cff8d2c5a0c939a8fcc6a57acec25608e0 100644 (file)
--- a/queue-3.0/serial-8250-increase-pass_limit.patch
+++ b/queue-3.0/serial-8250-increase-pass_limit.patch
@@ -18,7 +18,7 @@ problems. Maybe it's time to get rid of the message now?
 Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
 Cc: Alan Cox <alan@linux.intel.com>
 Cc: Ram Gupta <ram.gupta5@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
  drivers/tty/serial/8250.c |    2 +-

diff --git a/queue-3.0/series b/queue-3.0/series
index ef76a7275704b7d589e660f43392d2e8f9d001e8..730aaaf1d22b648a1fc5e6d8d0d09fd8fdc5db1b 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -7,3 +7,4 @@ scsi-sd-reshuffle-init_sd-to-avoid-crash.patch
 drivers-firmware-dmi_scan.c-check-dmi-version-when-get.patch
 drivers-firmware-dmi_scan.c-fetch-dmi-version-from-smbios-if-it-exists.patch
 serial-8250-increase-pass_limit.patch
+staging-usbip-changed-function-return-type-to-void.patch

diff --git a/queue-3.0/staging-usbip-changed-function-return-type-to-void.patch b/queue-3.0/staging-usbip-changed-function-return-type-to-void.patch
new file mode 100644 (file)
index 0000000..db3478d
--- /dev/null
+++ b/queue-3.0/staging-usbip-changed-function-return-type-to-void.patch
@@ -0,0 +1,86 @@
+From ac2b41acfa3efe4650102067a99251587a806d70 Mon Sep 17 00:00:00 2001
+From: Bart Westgeest <bart@elbrys.com>
+Date: Mon, 23 Jan 2012 10:55:46 -0500
+Subject: staging: usbip: changed function return type to void
+
+From: Bart Westgeest <bart@elbrys.com>
+
+commit ac2b41acfa3efe4650102067a99251587a806d70 upstream.
+
+The function usbip_pad_iso never returns anything but 0 (success).
+
+Signed-off-by: Bart Westgeest <bart@elbrys.com>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/usbip/usbip_common.c |   11 ++++-------
+ drivers/staging/usbip/usbip_common.h |    2 +-
+ drivers/staging/usbip/vhci_rx.c      |    3 +--
+ 3 files changed, 6 insertions(+), 10 deletions(-)
+
+--- a/drivers/staging/usbip/usbip_common.c
++++ b/drivers/staging/usbip/usbip_common.c
+@@ -761,26 +761,25 @@ EXPORT_SYMBOL_GPL(usbip_recv_iso);
+  * buffer and iso packets need to be stored and be in propeper endian in urb
+  * before calling this function
+  */
+-int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
++void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
+ {
+       int np = urb->number_of_packets;
+       int i;
+-      int ret;
+       int actualoffset = urb->actual_length;
+ 
+       if (!usb_pipeisoc(urb->pipe))
+-              return 0;
++              return;
+ 
+       /* if no packets or length of data is 0, then nothing to unpack */
+       if (np == 0 || urb->actual_length == 0)
+-              return 0;
++              return;
+ 
+       /*
+        * if actual_length is transfer_buffer_length then no padding is
+        * present.
+       */
+       if (urb->actual_length == urb->transfer_buffer_length)
+-              return 0;
++              return;
+ 
+       /*
+        * loop over all packets from last to first (to prevent overwritting
+@@ -792,8 +791,6 @@ int usbip_pad_iso(struct usbip_device *u
+                       urb->transfer_buffer + actualoffset,
+                       urb->iso_frame_desc[i].actual_length);
+       }
+-
+-      return ret;
+ }
+ EXPORT_SYMBOL_GPL(usbip_pad_iso);
+ 
+--- a/drivers/staging/usbip/usbip_common.h
++++ b/drivers/staging/usbip/usbip_common.h
+@@ -327,7 +327,7 @@ int usbip_recv_xbuff(struct usbip_device
+ /* some members of urb must be substituted before. */
+ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
+ /* some members of urb must be substituted before. */
+-int usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
++void usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
+ void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
+ 
+ /* usbip_event.c */
+--- a/drivers/staging/usbip/vhci_rx.c
++++ b/drivers/staging/usbip/vhci_rx.c
+@@ -94,8 +94,7 @@ static void vhci_recv_ret_submit(struct
+               return;
+ 
+       /* restore the padding in iso packets */
+-      if (usbip_pad_iso(ud, urb) < 0)
+-              return;
++      usbip_pad_iso(ud, urb);
+ 
+       if (usbip_dbg_flag_vhci_rx)
+               usbip_dump_urb(urb);