Re: [Fwd: [PATCH 1/2] CS89X0: Add cleanup for dma after fail]

[Jeff Garzik <jgarzik@pobox.com>]

Wang Chen wrote:
> Jeff, will you pick up this one?
> I also cc Andrew, because his name is in the code.
> 
> From: Wang Chen <wangchen@cn.fujitsu.com>
> 
> 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;
>  	}

applied