From b23fd32662fe4e4f460ab80af5d86633a42f3daf Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Tue, 8 Jul 2008 03:06:46 -0700 Subject: [PATCH] --- yaml --- r: 98824 b: refs/heads/master c: 568b4933a9902aed0f51e2e1bea3da157fb18833 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/via-ircc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bc9ea51a629b..3dd89a1df566 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3888e9efc9bf05e60504d2a420be7a527ff43678 +refs/heads/master: 568b4933a9902aed0f51e2e1bea3da157fb18833 diff --git a/trunk/drivers/net/irda/via-ircc.c b/trunk/drivers/net/irda/via-ircc.c index 58e128784585..04ad3573b159 100644 --- a/trunk/drivers/net/irda/via-ircc.c +++ b/trunk/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; }