[PATCH 1/4] irda: via-ircc proper dma freeing

["Samuel Ortiz" <samuel@sortiz.org>]

[-- Attachment #1: dma_cleanup.patch --]
[-- Type: text/plain, Size: 1077 bytes --]

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

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>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
---
 drivers/net/irda/via-ircc.c |    3 +++
 1 file changed, 3 insertions(+)

Index: net-next-2.6/drivers/net/irda/via-ircc.c
===================================================================
--- net-next-2.6.orig/drivers/net/irda/via-ircc.c	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/via-ircc.c	2008-06-14 13:25:18.000000000 +0200
@@ -1546,6 +1546,7 @@ static int via_ircc_net_open(struct net_
 			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
 	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;
 }

--