2.6.17-rc3-git10 refresh

5 files changed, 14 insertions, 14 deletions

diff --git a/usb/always-announce-new-usb-devices.patch b/usb/always-announce-new-usb-devices.patch
index e6d2ac9abe53f..c01c69a2ac55b 100644
--- a/usb/always-announce-new-usb-devices.patch
+++ b/usb/always-announce-new-usb-devices.patch
@@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/core/hub.c
 +++ gregkh-2.6/drivers/usb/core/hub.c
-@@ -1274,7 +1274,6 @@ static int choose_configuration(struct u
+@@ -1277,7 +1277,6 @@ static int choose_configuration(struct u
  	return i;
  }
  
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void show_string(struct usb_device *udev, char *id, char *string)
  {
  	if (!string)
-@@ -1282,10 +1281,6 @@ static void show_string(struct usb_devic
+@@ -1285,10 +1284,6 @@ static void show_string(struct usb_devic
  	dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string);
  }
  
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  
  #ifdef	CONFIG_USB_OTG
-@@ -1330,7 +1325,10 @@ int usb_new_device(struct usb_device *ud
+@@ -1333,7 +1328,10 @@ int usb_new_device(struct usb_device *ud
  	udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber);
  
  	/* Tell the world! */
diff --git a/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch b/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch
index 2b01544d26441..47d5a80df0a88 100644
--- a/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch
+++ b/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch
@@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/block/ub.c
 +++ gregkh-2.6/drivers/block/ub.c
-@@ -1648,15 +1648,11 @@ static void ub_revalidate(struct ub_dev 
+@@ -1651,15 +1651,11 @@ static void ub_revalidate(struct ub_dev 
  static int ub_bd_open(struct inode *inode, struct file *filp)
  {
  	struct gendisk *disk = inode->i_bdev->bd_disk;
diff --git a/usb/usb-console-fix-oops.patch b/usb/usb-console-fix-oops.patch
index 73679e08eaf2b..5e4bb03a0a06b 100644
--- a/usb/usb-console-fix-oops.patch
+++ b/usb/usb-console-fix-oops.patch
@@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
 +++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
-@@ -1259,7 +1259,6 @@ static void ftdi_shutdown (struct usb_se
+@@ -1261,7 +1261,6 @@ static void ftdi_shutdown (struct usb_se
  
  static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
  { /* ftdi_open */
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct usb_device *dev = port->serial->dev;
  	struct ftdi_private *priv = usb_get_serial_port_data(port);
  	unsigned long flags;
-@@ -1269,8 +1268,8 @@ static int  ftdi_open (struct usb_serial
+@@ -1271,8 +1270,8 @@ static int  ftdi_open (struct usb_serial
  
  	dbg("%s", __FUNCTION__);
  
@@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/* No error checking for this (will get errors later anyway) */
  	/* See ftdi_sio.h for description of what is reset */
-@@ -1284,7 +1283,8 @@ static int  ftdi_open (struct usb_serial
+@@ -1286,7 +1285,8 @@ static int  ftdi_open (struct usb_serial
  	   This is same behaviour as serial.c/rs_open() - Kuba */
  
  	/* ftdi_set_termios  will send usb control messages */
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/* FIXME: Flow control might be enabled, so it should be checked -
  	   we have no control of defaults! */
-@@ -1865,7 +1865,7 @@ static void ftdi_set_termios (struct usb
+@@ -1867,7 +1867,7 @@ static void ftdi_set_termios (struct usb
  			err("%s urb failed to set baudrate", __FUNCTION__);
  		}
  		/* Ensure RTS and DTR are raised when baudrate changed from 0 */
diff --git a/usb/usb-ub-oops-in-block_uevent.patch b/usb/usb-ub-oops-in-block_uevent.patch
index 4710adca9b306..a94e54b3d58d7 100644
--- a/usb/usb-ub-oops-in-block_uevent.patch
+++ b/usb/usb-ub-oops-in-block_uevent.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/block/ub.c
 +++ gregkh-2.6/drivers/block/ub.c
-@@ -534,6 +534,9 @@ static void ub_cleanup(struct ub_dev *sc
+@@ -536,6 +536,9 @@ static void ub_cleanup(struct ub_dev *sc
  		kfree(lun);
  	}
  
@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	kfree(sc);
  }
  
-@@ -2215,7 +2218,12 @@ static int ub_probe(struct usb_interface
+@@ -2221,7 +2224,12 @@ static int ub_probe(struct usb_interface
  	// sc->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
  	usb_set_intfdata(intf, sc);
  	usb_get_dev(sc->dev);
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	snprintf(sc->name, 12, DRV_NAME "(%d.%d)",
  	    sc->dev->bus->busnum, sc->dev->devnum);
-@@ -2280,7 +2288,7 @@ static int ub_probe(struct usb_interface
+@@ -2286,7 +2294,7 @@ static int ub_probe(struct usb_interface
  
  err_dev_desc:
  	usb_set_intfdata(intf, NULL);
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	usb_put_dev(sc->dev);
  	kfree(sc);
  err_core:
-@@ -2454,12 +2462,6 @@ static void ub_disconnect(struct usb_int
+@@ -2461,12 +2469,6 @@ static void ub_disconnect(struct usb_int
  	 * and no URBs left in transit.
  	 */
  
diff --git a/usb/usb-usbcore-don-t-check-the-device-s-power-source.patch b/usb/usb-usbcore-don-t-check-the-device-s-power-source.patch
index a2d2b058e444b..b42214ad53a2b 100644
--- a/usb/usb-usbcore-don-t-check-the-device-s-power-source.patch
+++ b/usb/usb-usbcore-don-t-check-the-device-s-power-source.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/core/hub.c
 +++ gregkh-2.6/drivers/usb/core/hub.c
-@@ -1175,19 +1175,9 @@ static inline const char *plural(int n)
+@@ -1168,19 +1168,9 @@ static inline const char *plural(int n)
  static int choose_configuration(struct usb_device *udev)
  {
  	int i;
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	best = NULL;
  	c = udev->config;
  	num_configs = udev->descriptor.bNumConfigurations;
-@@ -1204,6 +1194,19 @@ static int choose_configuration(struct u
+@@ -1197,6 +1187,19 @@ static int choose_configuration(struct u
  		 * similar errors in their descriptors.  If the next test
  		 * were allowed to execute, such configurations would always
  		 * be rejected and the devices would not work as expected.