浏览代码

irda: via-ircc proper dma freeing

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Wang Chen 17 年之前
父节点
当前提交
568b4933a9
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/net/irda/via-ircc.c

+ 3 - 0
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",
 			IRDA_WARNING("%s, unable to allocate dma2=%d\n",
 				     driver_name, self->io.dma2);
 				     driver_name, self->io.dma2);
 			free_irq(self->io.irq, self);
 			free_irq(self->io.irq, self);
+			free_dma(self->io.dma);
 			return -EAGAIN;
 			return -EAGAIN;
 		}
 		}
 	}
 	}
@@ -1606,6 +1607,8 @@ static int via_ircc_net_close(struct net_device *dev)
 	EnAllInt(iobase, OFF);
 	EnAllInt(iobase, OFF);
 	free_irq(self->io.irq, dev);
 	free_irq(self->io.irq, dev);
 	free_dma(self->io.dma);
 	free_dma(self->io.dma);
+	if (self->io.dma2 != self->io.dma)
+		free_dma(self->io.dma2);
 
 
 	return 0;
 	return 0;
 }
 }