From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeff Garzik <jgarzik@pobox.com>
Subject: Re: [Fwd: [PATCH 1/2] CS89X0: Add cleanup for dma after fail]
Date: Fri, 30 May 2008 22:12:57 -0400
Message-ID: <4840B429.60506@pobox.com>
References: <483F721F.1090204@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: "David S. Miller" <davem@davemloft.net>,
	NETDEV <netdev@vger.kernel.org>, akpm@linux-foundation.org
To: Wang Chen <wangchen@cn.fujitsu.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from srv5.dvmed.net ([207.36.208.214]:37113 "EHLO mail.dvmed.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752166AbYEaCNC (ORCPT <rfc822;netdev@vger.kernel.org>);
	Fri, 30 May 2008 22:13:02 -0400
In-Reply-To: <483F721F.1090204@cn.fujitsu.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

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