diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2013-03-08 10:42:59 +0900 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-03-13 16:11:11 +0100 |
| commit | f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5 (patch) | |
| tree | 60642309bb76ec56253266b4a2052f1217478fb9 /drivers/firewire | |
| parent | 48a8406f5bd5cb49e1c03777ed19638de2628882 (diff) | |
| download | linux-3.10-f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5.tar.gz linux-3.10-f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5.tar.bz2 linux-3.10-f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5.zip | |
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/firewire')
| -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 d9b2105f22a..efed4a65fb0 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1626,11 +1626,14 @@ static int fwnet_remove(struct device *_dev) fwnet_fifo_stop(dev); if (dev->broadcast_rcv_context) { fw_iso_context_stop(dev->broadcast_rcv_context); + kfree(dev->broadcast_rcv_buffer_ptrs); dev->broadcast_rcv_buffer_ptrs = NULL; fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card); fw_iso_context_destroy(dev->broadcast_rcv_context); + dev->broadcast_rcv_context = NULL; + dev->broadcast_state = FWNET_BROADCAST_ERROR; } for (i = 0; dev->queued_datagrams && i < 5; i++) ssleep(1); |