diff options
| author |   Wang Chen <wangchen@cn.fujitsu.com> | 2008-05-30 11:18:55 +0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2008-05-30 22:07:11 -0400 |
| commit | 17a9440f7deb781935c76e2e55d376a35611a6f9 (patch) | |
| tree | 1581e8f3ec1ac6b1c248f0c4dc3c5b002fb02717 /drivers/net/cs89x0.c | |
| parent | [netdrvr] sfc: Report XAUI link down at default log level (diff) | |
| download | linux-dev-17a9440f7deb781935c76e2e55d376a35611a6f9.tar.xz linux-dev-17a9440f7deb781935c76e2e55d376a35611a6f9.zip | |
[netdrvr] CS89X0: Add cleanup for dma after fail
After request_dma() succeeding, any error path should do free_dma().
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 348371fda597..fba87abe78ee 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -1394,7 +1394,11 @@ net_open(struct net_device *dev) #endif if (!result) { printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name); - release_irq: +release_dma: +#if ALLOW_DMA + free_dma(dev->dma); +#endif +release_irq: #if ALLOW_DMA release_dma_buff(lp); #endif @@ -1442,12 +1446,12 @@ net_open(struct net_device *dev) if ((result = detect_bnc(dev)) != DETECTED_NONE) break; printk(KERN_ERR "%s: no media detected\n", dev->name); - goto release_irq; + goto release_dma; } switch(result) { case DETECTED_NONE: printk(KERN_ERR "%s: no network cable attached to configured media\n", dev->name); - goto release_irq; + goto release_dma; case DETECTED_RJ45H: printk(KERN_INFO "%s: using half-duplex 10Base-T (RJ-45)\n", dev->name); break; |