Commit d09b74a3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: queue_task() fixups

parent 06ccf012
...@@ -1006,9 +1006,7 @@ static void bluetooth_write_bulk_callback (struct urb *urb) ...@@ -1006,9 +1006,7 @@ static void bluetooth_write_bulk_callback (struct urb *urb)
} }
/* wake up our little function to let the tty layer know that something happened */ /* wake up our little function to let the tty layer know that something happened */
queue_task(&bluetooth->tqueue, &tq_immediate); schedule_task(&bluetooth->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
......
...@@ -272,8 +272,7 @@ static void acm_write_bulk(struct urb *urb) ...@@ -272,8 +272,7 @@ static void acm_write_bulk(struct urb *urb)
if (urb->status) if (urb->status)
dbg("nonzero write bulk status received: %d", urb->status); dbg("nonzero write bulk status received: %d", urb->status);
queue_task(&acm->tqueue, &tq_immediate); schedule_task(&acm->tqueue);
mark_bh(IMMEDIATE_BH);
} }
static void acm_softint(void *private) static void acm_softint(void *private)
......
...@@ -437,9 +437,7 @@ static void cyberjack_write_bulk_callback (struct urb *urb) ...@@ -437,9 +437,7 @@ static void cyberjack_write_bulk_callback (struct urb *urb)
/* Throw away data. No better idea what to do with it. */ /* Throw away data. No better idea what to do with it. */
priv->wrfilled=0; priv->wrfilled=0;
priv->wrsent=0; priv->wrsent=0;
queue_task(&port->tqueue, &tq_immediate); goto exit;
mark_bh(IMMEDIATE_BH);
return;
} }
dbg("%s - priv->wrsent=%d", __FUNCTION__,priv->wrsent); dbg("%s - priv->wrsent=%d", __FUNCTION__,priv->wrsent);
...@@ -453,16 +451,10 @@ static void cyberjack_write_bulk_callback (struct urb *urb) ...@@ -453,16 +451,10 @@ static void cyberjack_write_bulk_callback (struct urb *urb)
priv->wrfilled=0; priv->wrfilled=0;
priv->wrsent=0; priv->wrsent=0;
} }
queue_task(&port->tqueue, &tq_immediate);
mark_bh(IMMEDIATE_BH);
return;
} }
queue_task(&port->tqueue, &tq_immediate); exit:
mark_bh(IMMEDIATE_BH); schedule_task(&port->tqueue);
return;
} }
static int __init cyberjack_init (void) static int __init cyberjack_init (void)
......
...@@ -362,11 +362,7 @@ static void empeg_write_bulk_callback (struct urb *urb) ...@@ -362,11 +362,7 @@ static void empeg_write_bulk_callback (struct urb *urb)
return; return;
} }
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
......
...@@ -484,10 +484,8 @@ static void ftdi_sio_write_bulk_callback (struct urb *urb) ...@@ -484,10 +484,8 @@ static void ftdi_sio_write_bulk_callback (struct urb *urb)
dbg("nonzero write bulk status received: %d", urb->status); dbg("nonzero write bulk status received: %d", urb->status);
return; return;
} }
queue_task(&port->tqueue, &tq_immediate);
mark_bh(IMMEDIATE_BH);
return; schedule_task(&port->tqueue);
} /* ftdi_sio_write_bulk_callback */ } /* ftdi_sio_write_bulk_callback */
......
...@@ -465,10 +465,8 @@ static void ipaq_write_bulk_callback(struct urb *urb) ...@@ -465,10 +465,8 @@ static void ipaq_write_bulk_callback(struct urb *urb)
priv->active = 0; priv->active = 0;
spin_unlock_irqrestore(&write_list_lock, flags); spin_unlock_irqrestore(&write_list_lock, flags);
} }
queue_task(&port->tqueue, &tq_immediate);
mark_bh(IMMEDIATE_BH);
return; schedule_task(&port->tqueue);
} }
static int ipaq_write_room(struct usb_serial_port *port) static int ipaq_write_room(struct usb_serial_port *port)
......
...@@ -426,10 +426,7 @@ static void ir_write_bulk_callback (struct urb *urb) ...@@ -426,10 +426,7 @@ static void ir_write_bulk_callback (struct urb *urb)
urb->actual_length, urb->actual_length,
urb->transfer_buffer); urb->transfer_buffer);
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
static void ir_read_bulk_callback (struct urb *urb) static void ir_read_bulk_callback (struct urb *urb)
......
...@@ -447,10 +447,8 @@ static void usa2x_outdat_callback(struct urb *urb) ...@@ -447,10 +447,8 @@ static void usa2x_outdat_callback(struct urb *urb)
p_priv = (struct keyspan_port_private *)(port->private); p_priv = (struct keyspan_port_private *)(port->private);
dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]); dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]);
if (port->open_count) { if (port->open_count)
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
}
} }
static void usa26_inack_callback(struct urb *urb) static void usa26_inack_callback(struct urb *urb)
......
...@@ -577,10 +577,7 @@ static void klsi_105_write_bulk_callback ( struct urb *urb) ...@@ -577,10 +577,7 @@ static void klsi_105_write_bulk_callback ( struct urb *urb)
} }
/* from generic_write_bulk_callback */ /* from generic_write_bulk_callback */
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} /* klsi_105_write_bulk_completion_callback */ } /* klsi_105_write_bulk_completion_callback */
......
...@@ -507,8 +507,7 @@ static void mct_u232_write_bulk_callback (struct urb *urb) ...@@ -507,8 +507,7 @@ static void mct_u232_write_bulk_callback (struct urb *urb)
} else { } else {
/* from generic_write_bulk_callback */ /* from generic_write_bulk_callback */
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
} }
return; return;
......
...@@ -359,12 +359,9 @@ static void omninet_write_bulk_callback (struct urb *urb) ...@@ -359,12 +359,9 @@ static void omninet_write_bulk_callback (struct urb *urb)
return; return;
} }
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
// dbg("omninet_write_bulk_callback, tty %0x\n", tty); // dbg("omninet_write_bulk_callback, tty %0x\n", tty);
return;
} }
......
...@@ -705,10 +705,7 @@ static void pl2303_write_bulk_callback (struct urb *urb) ...@@ -705,10 +705,7 @@ static void pl2303_write_bulk_callback (struct urb *urb)
return; return;
} }
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
......
...@@ -1092,10 +1092,7 @@ static void generic_write_bulk_callback (struct urb *urb) ...@@ -1092,10 +1092,7 @@ static void generic_write_bulk_callback (struct urb *urb)
usb_serial_port_softint((void *)port); usb_serial_port_softint((void *)port);
queue_task(&port->tqueue, &tq_immediate); schedule_tasks(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
static void generic_shutdown (struct usb_serial *serial) static void generic_shutdown (struct usb_serial *serial)
......
...@@ -458,10 +458,7 @@ static void visor_write_bulk_callback (struct urb *urb) ...@@ -458,10 +458,7 @@ static void visor_write_bulk_callback (struct urb *urb)
/* free up the transfer buffer, as usb_free_urb() does not do this */ /* free up the transfer buffer, as usb_free_urb() does not do this */
kfree (urb->transfer_buffer); kfree (urb->transfer_buffer);
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
......
...@@ -918,10 +918,7 @@ static void whiteheat_write_callback(struct urb *urb) ...@@ -918,10 +918,7 @@ static void whiteheat_write_callback(struct urb *urb)
usb_serial_port_softint((void *)port); usb_serial_port_softint((void *)port);
queue_task(&port->tqueue, &tq_immediate); schedule_task(&port->tqueue);
mark_bh(IMMEDIATE_BH);
return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment