* [PATCH 1/2] CS89X0: Add cleanup for dma after fail
@ 2008-05-23 5:55 Wang Chen
0 siblings, 0 replies; only message in thread
From: Wang Chen @ 2008-05-23 5:55 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Russell Nelson, Andrew Morton, NETDEV, David S. Miller
After request_dma() succeeding, any error path should do free_dma().
Signed-off-by: Wang Chen <wangchen@cn•fujitsu.com>
---
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 348371f..fba87ab 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;
--
1.5.4.rc3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-23 5:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-23 5:55 [PATCH 1/2] CS89X0: Add cleanup for dma after fail Wang Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox