patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / usb / serial / belkin_sa.c

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 4592d7a..ad222ec 100644 (file)
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -244,23 +244,12 @@ exit:
 
 static void belkin_sa_close (struct usb_serial_port *port, struct file *filp)
 {
-       struct usb_serial *serial;
-
-       if (port_paranoia_check (port, __FUNCTION__))
-               return;
-
-       serial = get_usb_serial (port, __FUNCTION__);
-       if (!serial)
-               return;
-
        dbg("%s port %d", __FUNCTION__, port->number);
 
-       if (serial->dev) {
-               /* shutdown our bulk reads and writes */
-               usb_unlink_urb (port->write_urb);
-               usb_unlink_urb (port->read_urb);
-               usb_unlink_urb (port->interrupt_in_urb);
-       }
+       /* shutdown our bulk reads and writes */
+       usb_unlink_urb (port->write_urb);
+       usb_unlink_urb (port->read_urb);
+       usb_unlink_urb (port->interrupt_in_urb);
 } /* belkin_sa_close */
 
 
@@ -268,7 +257,6 @@ static void belkin_sa_read_int_callback (struct urb *urb, struct pt_regs *regs)
 {
        struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
        struct belkin_sa_private *priv;
-       struct usb_serial *serial;
        unsigned char *data = urb->transfer_buffer;
        int retval;
        unsigned long flags;
@@ -288,14 +276,6 @@ static void belkin_sa_read_int_callback (struct urb *urb, struct pt_regs *regs)
                goto exit;
        }
 
-       if (port_paranoia_check (port, __FUNCTION__))
-               return;
-
-       serial = port->serial;
-
-       if (serial_paranoia_check (serial, __FUNCTION__))
-               return;
-       
        usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data);
 
        /* Handle known interrupt data */