diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-04 11:50:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-04 11:50:00 -0700 |
| commit | 8b91ac09732895f928ed6107bda5318cf260520b (patch) | |
| tree | 5fc787bb3e0f4a4f84a928b7708023e4996608cd /drivers/net/cs89x0.c | |
| parent | 8aca6cb1179ed9bef9351028c8d8af852903eae2 (diff) | |
| parent | 56997fa838e333cea33ab641d4aeedd23aef0eb1 (diff) | |
| download | linux-8b91ac09732895f928ed6107bda5318cf260520b.tar.gz linux-8b91ac09732895f928ed6107bda5318cf260520b.tar.bz2 linux-8b91ac09732895f928ed6107bda5318cf260520b.zip | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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; |