Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a9440f authored by Wang Chen's avatar Wang Chen Committed by Jeff Garzik
Browse files

[netdrvr] CS89X0: Add cleanup for dma after fail 



After request_dma() succeeding, any error path should do free_dma().

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b055629e

drivers/net/cs89x0.c

+7 −3
Original line number Diff line number Diff line
@@ -1394,6 +1394,10 @@ net_open(struct net_device *dev) 
#endif

        if (!result) {

                printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);

release_dma:

#if ALLOW_DMA

		free_dma(dev->dma);

#endif

release_irq:

#if ALLOW_DMA

		release_dma_buff(lp);
@@ -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;