From cc15b29d8bb4c22e5184399929ac1b111bb24020 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Wed, 17 Mar 2010 23:06:06 +0100
Subject: [PATCH] --- yaml --- r: 195358 b: refs/heads/master c:
 40f92f0dcd9b215c48c53a226328e8e36615e367 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/serial/generic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 078f2087b619..7e7c68f1af56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80fa92c1335a3c7f85a3e0d3dbffd79984fdccc0
+refs/heads/master: 40f92f0dcd9b215c48c53a226328e8e36615e367
diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c
index 9756b5c22d94..be52c748bccb 100644
--- a/trunk/drivers/usb/serial/generic.c
+++ b/trunk/drivers/usb/serial/generic.c
@@ -217,7 +217,7 @@ static int usb_serial_multi_urb_write(struct tty_struct *tty,
 			usb_sndbulkpipe(port->serial->dev,
 					port->bulk_out_endpointAddress),
 			buffer, towrite,
-			usb_serial_generic_write_bulk_callback, port);
+			port->serial->type->write_bulk_callback, port);
 
 		status = usb_submit_urb(urb, GFP_ATOMIC);
 		if (status) {