[PATCH 2/2] IRDA: Do cleanup for dma

[PATCH 2/2] IRDA: Do cleanup for dma

[Wang Chen]

1. dma should be freed when dma2 request fail.
2. dma2 should be freed too when device close.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
---
 drivers/net/irda/via-ircc.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 58e1287..04ad357 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -1546,6 +1546,7 @@ static int via_ircc_net_open(struct net_device *dev)
 			IRDA_WARNING("%s, unable to allocate dma2=%d\n",
 				     driver_name, self->io.dma2);
 			free_irq(self->io.irq, self);
+			free_dma(self->io.dma);
 			return -EAGAIN;
 		}
 	}
@@ -1606,6 +1607,8 @@ static int via_ircc_net_close(struct net_device *dev)
 	EnAllInt(iobase, OFF);
 	free_irq(self->io.irq, dev);
 	free_dma(self->io.dma);
+	if (self->io.dma2 != self->io.dma)
+		free_dma(self->io.dma2);
 
 	return 0;
 }
-- 
1.5.4.rc3

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[David Miller]

From: Wang Chen <wangchen@cn.fujitsu.com>
Date: Fri, 23 May 2008 13:57:19 +0800

> 1. dma should be freed when dma2 request fail.
> 2. dma2 should be freed too when device close.
> 
> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>

Jeff, did you get this or would you like me to pick
it up directly?

Thanks.

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[samuel]

Hi Dave,



On Thu, 29 May 2008 03:34:42 -0700 (PDT), David Miller

<davem@davemloft.net> wrote:

> From: Wang Chen <wangchen@cn.fujitsu.com>

> Date: Fri, 23 May 2008 13:57:19 +0800

> 

>> 1. dma should be freed when dma2 request fail.

>> 2. dma2 should be freed too when device close.

>>

>> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>

> 

> Jeff, did you get this or would you like me to pick

> it up directly?

I'll take it and send it along with my next IrDA patch set.



Cheers,

Samuel.





> Thanks.

> --

> To unsubscribe from this list: send the line "unsubscribe netdev" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[Wang Chen]

samuel@sortiz.org said the following on 2006-1-21 14:07:
>>> 1. dma should be freed when dma2 request fail.
>>> 2. dma2 should be freed too when device close.
>>>
>>> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
>> Jeff, did you get this or would you like me to pick
>> it up directly?
> I'll take it and send it along with my next IrDA patch set.
> 

oops, sorry. 
Seems that not all of the drivers/net/* fixes should be sent
to Jeff.
I will check MAINTAINERS more carefully next time.

--WCN

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[David Miller]

From: <samuel@sortiz.org>
Date: Sat, 21 Jan 2006 07:07:16 +0100

> 
> Hi Dave,
> 
> On Thu, 29 May 2008 03:34:42 -0700 (PDT), David Miller
> <davem@davemloft.net> wrote:
> > From: Wang Chen <wangchen@cn.fujitsu.com>
> > Date: Fri, 23 May 2008 13:57:19 +0800
> > 
> >> 1. dma should be freed when dma2 request fail.
> >> 2. dma2 should be freed too when device close.
> >>
> >> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
> > 
> > Jeff, did you get this or would you like me to pick
> > it up directly?
> I'll take it and send it along with my next IrDA patch set.

Oh ok, you got it :-)

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[Jeff Garzik]

David Miller wrote:
> From: Wang Chen <wangchen@cn.fujitsu.com>
> Date: Fri, 23 May 2008 13:57:19 +0800
> 
>> 1. dma should be freed when dma2 request fail.
>> 2. dma2 should be freed too when device close.
>>
>> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
> 
> Jeff, did you get this or would you like me to pick
> it up directly?

I never pick up IRDA stuff.

	Jeff

Re: [PATCH 2/2] IRDA: Do cleanup for dma

[David Miller]

From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 29 May 2008 09:27:21 -0400

> David Miller wrote:
> > From: Wang Chen <wangchen@cn.fujitsu.com>
> > Date: Fri, 23 May 2008 13:57:19 +0800
> > 
> >> 1. dma should be freed when dma2 request fail.
> >> 2. dma2 should be freed too when device close.
> >>
> >> Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
> > 
> > Jeff, did you get this or would you like me to pick
> > it up directly?
> 
> I never pick up IRDA stuff.

Great I'll apply it then.