git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
keyspan_pda.c
diff --git
a/drivers/usb/serial/keyspan_pda.c
b/drivers/usb/serial/keyspan_pda.c
index
36d8e6a
..
5a349ae
100644
(file)
--- a/
drivers/usb/serial/keyspan_pda.c
+++ b/
drivers/usb/serial/keyspan_pda.c
@@
-226,8
+226,7
@@
static void keyspan_pda_request_unthrottle( struct usb_serial *serial )
static void keyspan_pda_rx_interrupt (struct urb *urb, struct pt_regs *regs)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
static void keyspan_pda_rx_interrupt (struct urb *urb, struct pt_regs *regs)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
- struct usb_serial *serial;
- struct tty_struct *tty;
+ struct tty_struct *tty = port->tty;
unsigned char *data = urb->transfer_buffer;
int i;
int status;
unsigned char *data = urb->transfer_buffer;
int i;
int status;
@@
-249,22
+248,11
@@
static void keyspan_pda_rx_interrupt (struct urb *urb, struct pt_regs *regs)
goto exit;
}
goto exit;
}
-
- if (port_paranoia_check (port, "keyspan_pda_rx_interrupt")) {
- return;
- }
-
- serial = port->serial;
- if (serial_paranoia_check (serial, "keyspan_pda_rx_interrupt")) {
- return;
- }
-
/* see if the message is data or a status interrupt */
switch (data[0]) {
case 0:
/* rest of message is rx data */
if (urb->actual_length) {
/* see if the message is data or a status interrupt */
switch (data[0]) {
case 0:
/* rest of message is rx data */
if (urb->actual_length) {
- tty = serial->port[0]->tty;
for (i = 1; i < urb->actual_length ; ++i) {
tty_insert_flip_char(tty, data[i], 0);
}
for (i = 1; i < urb->actual_length ; ++i) {
tty_insert_flip_char(tty, data[i], 0);
}
@@
-278,7
+266,6
@@
static void keyspan_pda_rx_interrupt (struct urb *urb, struct pt_regs *regs)
case 1: /* modemline change */
break;
case 2: /* tx unthrottle interrupt */
case 1: /* modemline change */
break;
case 2: /* tx unthrottle interrupt */
- tty = serial->port[0]->tty;
priv->tx_throttled = 0;
/* queue up a wakeup at scheduler time */
schedule_work(&priv->wakeup_work);
priv->tx_throttled = 0;
/* queue up a wakeup at scheduler time */
schedule_work(&priv->wakeup_work);
@@
-633,20
+620,10
@@
exit:
static void keyspan_pda_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
static void keyspan_pda_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
- struct usb_serial *serial;
struct keyspan_pda_private *priv;
priv = usb_get_serial_port_data(port);
struct keyspan_pda_private *priv;
priv = usb_get_serial_port_data(port);
- if (port_paranoia_check (port, "keyspan_pda_rx_interrupt")) {
- return;
- }
-
- serial = port->serial;
- if (serial_paranoia_check (serial, "keyspan_pda_rx_interrupt")) {
- return;
- }
-
/* queue up a wakeup at scheduler time */
schedule_work(&priv->wakeup_work);
}
/* queue up a wakeup at scheduler time */
schedule_work(&priv->wakeup_work);
}