patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 29a8140..3c123be 100644 (file)
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1396,11 +1396,6 @@ dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status );
                return;
        }
 
-       /* further sanity checks */
-       if( port_paranoia_check( port, __FUNCTION__ )
-       || serial_paranoia_check( serial, __FUNCTION__ ) )
-               return;
-
        /* try to send any buffered data on this port, if it is open */
        spin_lock( &priv->dp_port_lock );
        priv->dp_write_urb_in_use = 0;
@@ -1798,7 +1793,6 @@ dbg( "digi_read_bulk_callback: TOP" );
                return;
        }
        if( port->serial == NULL
-       || serial_paranoia_check( port->serial, __FUNCTION__ )
        || (serial_priv=usb_get_serial_data(port->serial)) == NULL ) {
                err("%s: serial is bad or serial->private is NULL, status=%d", __FUNCTION__, urb->status );
                return;
@@ -1851,11 +1845,6 @@ static int digi_read_inb_callback( struct urb *urb )
        unsigned char *data = ((unsigned char *)urb->transfer_buffer)+3;
        int flag,throttled;
 
-
-       /* sanity check */
-       if( port_paranoia_check( port, __FUNCTION__ ) )
-               return( -1 );
-
        /* do not process callbacks on closed ports */
        /* but do continue the read chain */
        if( port->open_count == 0 )
@@ -1980,9 +1969,8 @@ opcode, line, status, val );
 
                port = serial->port[line];
 
-               if( port_paranoia_check( port, __FUNCTION__ )
-               || (priv=usb_get_serial_port_data(port)) == NULL )
-                       return( -1 );
+               if ((priv=usb_get_serial_port_data(port)) == NULL )
+                       return -1;
 
                if( opcode == DIGI_CMD_READ_INPUT_SIGNALS ) {