Commit 9d2b920e authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by David S. Miller

[IRDA]: Use kill_urb() in stir4200

USB changed behaviour of unlink_urb so that it gives warning and backtrace when
being used synchronously. The correct current behaviour is to us kill_urb
in that case.

Original patch from Stephen Hemminger
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8899cfa3
...@@ -705,7 +705,7 @@ static int receive_start(struct stir_cb *stir) ...@@ -705,7 +705,7 @@ static int receive_start(struct stir_cb *stir)
static void receive_stop(struct stir_cb *stir) static void receive_stop(struct stir_cb *stir)
{ {
stir->receiving = 0; stir->receiving = 0;
usb_unlink_urb(stir->rx_urb); usb_kill_urb(stir->rx_urb);
if (stir->rx_buff.in_frame) if (stir->rx_buff.in_frame)
stir->stats.collisions++; stir->stats.collisions++;
...@@ -974,7 +974,7 @@ static int stir_net_close(struct net_device *netdev) ...@@ -974,7 +974,7 @@ static int stir_net_close(struct net_device *netdev)
kfree(stir->fifo_status); kfree(stir->fifo_status);
/* Mop up receive urb's */ /* Mop up receive urb's */
usb_unlink_urb(stir->rx_urb); usb_kill_urb(stir->rx_urb);
kfree(stir->io_buf); kfree(stir->io_buf);
usb_free_urb(stir->rx_urb); usb_free_urb(stir->rx_urb);
......
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