From 602b7a0466112231620a850355ffa244be5e40c3 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 12:36:45 +0100
Subject: [PATCH] --- yaml --- r: 364406 b: refs/heads/master c:
 30d9d42e9a7c205cc139dce743463b8070684df5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index af3a4154ff14..d9515e421a1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3452f5e444446fad9bb1957d22a25334798f94c
+refs/heads/master: 30d9d42e9a7c205cc139dce743463b8070684df5
diff --git a/trunk/drivers/usb/serial/cyberjack.c b/trunk/drivers/usb/serial/cyberjack.c
index de9253d63a48..781426230d69 100644
--- a/trunk/drivers/usb/serial/cyberjack.c
+++ b/trunk/drivers/usb/serial/cyberjack.c
@@ -51,7 +51,6 @@
 #define CYBERJACK_PRODUCT_ID	0x0100
 
 /* Function prototypes */
-static void cyberjack_disconnect(struct usb_serial *serial);
 static int cyberjack_port_probe(struct usb_serial_port *port);
 static int cyberjack_port_remove(struct usb_serial_port *port);
 static int  cyberjack_open(struct tty_struct *tty,
@@ -79,7 +78,6 @@ static struct usb_serial_driver cyberjack_device = {
 	.description =		"Reiner SCT Cyberjack USB card reader",
 	.id_table =		id_table,
 	.num_ports =		1,
-	.disconnect =		cyberjack_disconnect,
 	.port_probe =		cyberjack_port_probe,
 	.port_remove =		cyberjack_port_remove,
 	.open =			cyberjack_open,
@@ -130,20 +128,14 @@ static int cyberjack_port_remove(struct usb_serial_port *port)
 {
 	struct cyberjack_private *priv;
 
+	usb_kill_urb(port->interrupt_in_urb);
+
 	priv = usb_get_serial_port_data(port);
 	kfree(priv);
 
 	return 0;
 }
 
-static void cyberjack_disconnect(struct usb_serial *serial)
-{
-	int i;
-
-	for (i = 0; i < serial->num_ports; ++i)
-		usb_kill_urb(serial->port[i]->interrupt_in_urb);
-}
-
 static int  cyberjack_open(struct tty_struct *tty,
 					struct usb_serial_port *port)
 {