diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2013-03-07 20:42:59 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-03-13 11:11:11 -0400 |
commit | f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5 (patch) | |
tree | 60642309bb76ec56253266b4a2052f1217478fb9 /drivers | |
parent | 48a8406f5bd5cb49e1c03777ed19638de2628882 (diff) |
firewire net: Clear dev->broadcast_rcv_context and dev->broadcast_state after destruction of context.
Clear dev->broadcast_rcv_context to NULL and set dev->broadcast_state
to FWNET_BROADCAST_ERROR after descruction of broadcast context.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firewire/net.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index d9b2105f22a0..efed4a65fb06 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c | |||
@@ -1626,11 +1626,14 @@ static int fwnet_remove(struct device *_dev) | |||
1626 | fwnet_fifo_stop(dev); | 1626 | fwnet_fifo_stop(dev); |
1627 | if (dev->broadcast_rcv_context) { | 1627 | if (dev->broadcast_rcv_context) { |
1628 | fw_iso_context_stop(dev->broadcast_rcv_context); | 1628 | fw_iso_context_stop(dev->broadcast_rcv_context); |
1629 | |||
1629 | kfree(dev->broadcast_rcv_buffer_ptrs); | 1630 | kfree(dev->broadcast_rcv_buffer_ptrs); |
1630 | dev->broadcast_rcv_buffer_ptrs = NULL; | 1631 | dev->broadcast_rcv_buffer_ptrs = NULL; |
1631 | fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, | 1632 | fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, |
1632 | dev->card); | 1633 | dev->card); |
1633 | fw_iso_context_destroy(dev->broadcast_rcv_context); | 1634 | fw_iso_context_destroy(dev->broadcast_rcv_context); |
1635 | dev->broadcast_rcv_context = NULL; | ||
1636 | dev->broadcast_state = FWNET_BROADCAST_ERROR; | ||
1634 | } | 1637 | } |
1635 | for (i = 0; dev->queued_datagrams && i < 5; i++) | 1638 | for (i = 0; dev->queued_datagrams && i < 5; i++) |
1636 | ssleep(1); | 1639 | ssleep(1); |