diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 22:33:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:59:08 -0700 |
commit | d74472f0b2553e59eafb7feee0ff9558136a17e0 (patch) | |
tree | 38d85faf098e7c5b1e41dc23ea6c9044f8ae3e91 /drivers/net/jazzsonic.c | |
parent | 8b6aaab8c8bdbe011aac79af218dd1e657984bab (diff) | |
download | linux-d74472f0b2553e59eafb7feee0ff9558136a17e0.tar.gz linux-d74472f0b2553e59eafb7feee0ff9558136a17e0.tar.bz2 linux-d74472f0b2553e59eafb7feee0ff9558136a17e0.zip |
SONIC: small fix and cleanup
Fix a potential problem in the timeout handling: don't free the DMA buffers
before resetting the chip.
Also a trivial cleanup. Bring macsonic and jazzsonic into sync.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r-- | drivers/net/jazzsonic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index d34afb52ea7f..1a73630fd7d5 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -269,11 +269,11 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); struct sonic_local* lp = netdev_priv(dev); - unregister_netdev (dev); + unregister_netdev(dev); dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), lp->descriptors, lp->descriptors_laddr); release_region (dev->base_addr, SONIC_MEM_SIZE); - free_netdev (dev); + free_netdev(dev); return 0; } |