9 files changed, 4 insertions, 224 deletions
diff --git a/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
index 3a04a4f65abda5..da8030353c1d25 100644
--- a/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
@@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  				new_dev->driver = driver;
 --- a/drivers/video/fbmem.c
 +++ b/drivers/video/fbmem.c
-@@ -1438,9 +1438,8 @@ register_framebuffer(struct fb_info *fb_
+@@ -1442,9 +1442,8 @@ register_framebuffer(struct fb_info *fb_
  			break;
  	fb_info->node = i;
  
diff --git a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
index 8ef81e1be3d0d1..6a8b096ca8d974 100644
--- a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
+++ b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -1675,6 +1675,11 @@ and is between 256 and 4096 characters. 
+@@ -1677,6 +1677,11 @@ and is between 256 and 4096 characters. 
  			autoconfiguration.
  			Ranges are in pairs (memory base and size).
  
diff --git a/series b/series
index 46d1fa9e2cd3bc..266b2265b36e69 100644
--- a/series
+++ b/series
@@ -149,10 +149,6 @@ usb/fsl_usb2_udc-fix-oops-on-probe-failure.patch
 usb/usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch
 
 # HSO - goes through jeff
-usb/hso-fix-oops-in-read-write-callbacks.patch
-usb/hso-fix-refcounting-on-the-ttyhsx-devices.patch
-usb/usb-hso-make-tty_operations-const.patch
-usb/usb-hso-minor-fixes-due-to-code-review.patch
 usb/hso-icon-322-detection-fix.patch
 usb/hso-dev_kfree_skb-crash-fix.patch
 usb/hso-fix-hso_serial_close-refcounting.patch
diff --git a/usb/hso-fix-oops-in-read-write-callbacks.patch b/usb/hso-fix-oops-in-read-write-callbacks.patch
deleted file mode 100644
index 5c5f5fa81a0b9f..00000000000000
--- a/usb/hso-fix-oops-in-read-write-callbacks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From blino@mandriva.com  Fri Aug  8 10:35:42 2008
-From: Olivier Blin <blino@mandriva.com>
-Date: Wed, 28 May 2008 00:47:05 +0200
-Subject: hso: fix oops in read/write callbacks
-To: linux-usb@vger.kernel.org
-Cc: Olivier Blin <blino@mandriva.com>
-Message-ID: <1211928426-2390-1-git-send-email-blino@mandriva.com>
-
-
-The tty may be closed already when the read/write callbacks are called.
-This patch checks that the ttys still exist before waking them up.
-
-Signed-off-by: Olivier Blin <blino@mandriva.com>
-Acked-by: Alan Cox <alan@redhat.com>
-Cc: Jari Tenhunen <jari.tenhunen@iki.fi>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/usb/hso.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -1467,7 +1467,8 @@ static void hso_std_serial_write_bulk_ca
- 		return;
- 	}
- 	hso_put_activity(serial->parent);
--	tty_wakeup(serial->tty);
-+	if (serial->tty)
-+		tty_wakeup(serial->tty);
- 	hso_kick_transmit(serial);
- 
- 	D1(" ");
-@@ -1538,7 +1539,8 @@ static void ctrl_callback(struct urb *ur
- 			clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags);
- 	} else {
- 		hso_put_activity(serial->parent);
--		tty_wakeup(serial->tty);
-+		if (serial->tty)
-+			tty_wakeup(serial->tty);
- 		/* response to a write command */
- 		hso_kick_transmit(serial);
- 	}
diff --git a/usb/hso-fix-refcounting-on-the-ttyhsx-devices.patch b/usb/hso-fix-refcounting-on-the-ttyhsx-devices.patch
deleted file mode 100644
index 0c6037a502c693..00000000000000
--- a/usb/hso-fix-refcounting-on-the-ttyhsx-devices.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From blino@mandriva.com  Fri Aug  8 10:35:56 2008
-From: Olivier Blin <blino@mandriva.com>
-Date: Wed, 28 May 2008 00:47:06 +0200
-Subject: hso: fix refcounting on the ttyHSx devices
-To: linux-usb@vger.kernel.org
-Cc: Olivier Blin <blino@mandriva.com>
-Message-ID: <1211928426-2390-2-git-send-email-blino@mandriva.com>
-
-
-The references on ttyHSx devices were not decremented correctly when
-the tty was closed. The helper freeing the serial devices was never
-called because of that, and the module left some dangling sysfs
-devices after being unloaded.
-
-Signed-off-by: Olivier Blin <blino@mandriva.com>
-Cc: Jari Tenhunen <jari.tenhunen@iki.fi>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/usb/hso.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -1103,8 +1103,8 @@ static void hso_serial_close(struct tty_
- 	/* reset the rts and dtr */
- 	/* do the actual close */
- 	serial->open_count--;
-+	kref_put(&serial->parent->ref, hso_serial_ref_free);
- 	if (serial->open_count <= 0) {
--		kref_put(&serial->parent->ref, hso_serial_ref_free);
- 		serial->open_count = 0;
- 		if (serial->tty) {
- 			serial->tty->driver_data = NULL;
diff --git a/usb/usb-hso-make-tty_operations-const.patch b/usb/usb-hso-make-tty_operations-const.patch
deleted file mode 100644
index d8cf12687574ff..00000000000000
--- a/usb/usb-hso-make-tty_operations-const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From foo@baz Tue Apr  9 12:12:43 2002
-Date: Fri,  8 Aug 2008 07:16:58 -0600 (MDT)
-To: Greg KH <greg@kroah.com>
-From: Greg Kroah-Hartman <gregkh@suse.de>
-Subject: USB: HSO: make tty_operations const
-
-As recommended by Arjan.
-
-Cc: Arjan van de Ven <arjan@infradead.org>
-Cc: Andrew Bird <ajb@spheresystems.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/usb/hso.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -2725,7 +2725,7 @@ static int hso_mux_submit_intr_urb(struc
- }
- 
- /* operations setup of the serial interface */
--static struct tty_operations hso_serial_ops = {
-+static const struct tty_operations hso_serial_ops = {
- 	.open = hso_serial_open,
- 	.close = hso_serial_close,
- 	.write = hso_serial_write,
diff --git a/usb/usb-hso-minor-fixes-due-to-code-review.patch b/usb/usb-hso-minor-fixes-due-to-code-review.patch
deleted file mode 100644
index 4e069f5d8eb7e5..00000000000000
--- a/usb/usb-hso-minor-fixes-due-to-code-review.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From foo@baz Tue Apr  9 12:12:43 2002
-Date: Fri,  8 Aug 2008 07:16:58 -0600 (MDT)
-To: Greg KH <greg@kroah.com>
-From: Greg Kroah-Hartman <gregkh@suse.de>
-Subject: USB: HSO: minor fixes due to code review
-
-Fix up problems in hso.c driver as pointed out by Andrew.
-
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/usb/hso.c |   43 ++++++++++++++++++++++++-------------------
- 1 file changed, 24 insertions(+), 19 deletions(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -102,8 +102,12 @@
- 
- #define MAX_RX_URBS			2
- 
--#define get_serial_by_tty(x)	\
--	(x ? (struct hso_serial *)x->driver_data : NULL)
-+static inline struct hso_serial *get_serial_by_tty(struct tty_struct *tty)
-+{
-+	if (tty)
-+		return tty->driver_data;
-+	return NULL;
-+}
- 
- /*****************************************************************************/
- /* Debugging functions                                                       */
-@@ -294,24 +298,25 @@ static int hso_get_activity(struct hso_d
- 
- /* #define DEBUG */
- 
--#define dev2net(x) (x->port_data.dev_net)
--#define dev2ser(x) (x->port_data.dev_serial)
-+static inline struct hso_net *dev2net(struct hso_device *hso_dev)
-+{
-+	return hso_dev->port_data.dev_net;
-+}
-+
-+static inline struct hso_serial *dev2ser(struct hso_device *hso_dev)
-+{
-+	return hso_dev->port_data.dev_serial;
-+}
- 
- /* Debugging functions */
- #ifdef DEBUG
- static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,
- 		     unsigned int len)
- {
--	u8 i = 0;
--
--	printk(KERN_DEBUG "[%d:%s]: len %d", line_count, func_name, len);
-+	static char name[255];
- 
--	for (i = 0; i < len; i++) {
--		if (!(i % 16))
--			printk("\n    0x%03x:  ", i);
--		printk("%02x ", (unsigned char)buf[i]);
--	}
--	printk("\n");
-+	sprintf(name, "hso[%d:%s]", line_count, func_name);
-+	print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len);
- }
- 
- #define DUMP(buf_, len_)	\
-@@ -528,13 +533,12 @@ static struct hso_serial *get_serial_by_
- 
- static struct hso_serial *get_serial_by_index(unsigned index)
- {
--	struct hso_serial *serial;
-+	struct hso_serial *serial = NULL;
- 	unsigned long flags;
- 
--	if (!serial_table[index])
--		return NULL;
- 	spin_lock_irqsave(&serial_table_lock, flags);
--	serial = dev2ser(serial_table[index]);
-+	if (serial_table[index])
-+		serial = dev2ser(serial_table[index]);
- 	spin_unlock_irqrestore(&serial_table_lock, flags);
- 
- 	return serial;
-@@ -561,6 +565,7 @@ static int get_free_serial_index(void)
- static void set_serial_by_index(unsigned index, struct hso_serial *serial)
- {
- 	unsigned long flags;
-+
- 	spin_lock_irqsave(&serial_table_lock, flags);
- 	if (serial)
- 		serial_table[index] = serial->parent;
-@@ -569,7 +574,7 @@ static void set_serial_by_index(unsigned
- 	spin_unlock_irqrestore(&serial_table_lock, flags);
- }
- 
--/* log a meaningfull explanation of an USB status */
-+/* log a meaningful explanation of an USB status */
- static void log_usb_status(int status, const char *function)
- {
- 	char *explanation;
-@@ -2654,7 +2659,7 @@ static void hso_free_interface(struct us
- 			hso_stop_net_device(network_table[i]);
- 			cancel_work_sync(&network_table[i]->async_put_intf);
- 			cancel_work_sync(&network_table[i]->async_get_intf);
--			if(rfk)
-+			if (rfk)
- 				rfkill_unregister(rfk);
- 			hso_free_net_device(network_table[i]);
- 		}
diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch
index 7e3c7941a1f65b..0cedd0ef3eae56 100644
--- a/usb/usb-remove-info-macro-from-usb.h.patch
+++ b/usb/usb-remove-info-macro-from-usb.h.patch
@@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  TO CHECK:  Is pressure done right on report 5?
  
-@@ -1011,7 +1011,7 @@ static void gtco_disconnect(struct usb_i
+@@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_i
  		kfree(gtco);
  	}
  
diff --git a/version b/version
index ad76f2e6c2355f..627a1a1703b294 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.27-rc3-git6
+2.6.27-rc4