summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Tettamanti <kronos.it@gmail.com>2010-09-22 12:42:31 +0200
committerDavid S. Miller <davem@davemloft.net>2010-09-22 22:52:45 +0200
commit3f5a2a713aad28480d86b0add00c68484b54febc (patch)
tree1f1642ae02c7e3db0f45e3917b01ee91624be640
parentatl1: fix resume (diff)
downloadlinux-3f5a2a713aad28480d86b0add00c68484b54febc.tar.xz
linux-3f5a2a713aad28480d86b0add00c68484b54febc.zip
atl1: zero out CMB and SBM in atl1_free_ring_resources
They are allocated in atl1_setup_ring_resources, zero out the pointers in atl1_free_ring_resources (like the other resources). Signed-off-by: Luca Tettamanti <kronos.it@gmail.com> Acked-by: Chris Snook <chris.snook@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/atlx/atl1.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index bbd6e3009be0..c73be2848319 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -1251,6 +1251,12 @@ static void atl1_free_ring_resources(struct atl1_adapter *adapter)
rrd_ring->desc = NULL;
rrd_ring->dma = 0;
+
+ adapter->cmb.dma = 0;
+ adapter->cmb.cmb = NULL;
+
+ adapter->smb.dma = 0;
+ adapter->smb.smb = NULL;
}
static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)