From f60bac4bc9f8c6b20b27a2be210a69e2f256f0a5 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 8 Mar 2013 10:42:59 +0900 Subject: 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 Signed-off-by: Stefan Richter --- drivers/firewire/net.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/firewire') 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) 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); -- cgit v1.2.3