From 6bd50a15e8ae5e88418cd6d1190c65525c6417ff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Jan 2009 22:32:58 -0700 Subject: [PATCH] --- yaml --- r: 130063 b: refs/heads/master c: 6782dfe44acedf1e583d84e9e0d4f966d8e9befa h: refs/heads/master i: 130061: 5fef830bd9759632bc2d8b1a4d6cf2234e2091dd 130059: 6aef194dc0c3f4b1d5688ac5df8e60413cf4252e 130055: b84384925f8e76cc563554a756ff6213a6f2e1a4 130047: 1c6e33aa348a09cce2b27e193bf121abfa4520af v: v3 --- [refs] | 2 +- trunk/drivers/dma/fsldma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1a54d25eeb9..ae62953a72f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d86be86e9aab221089d72399072511f13fe2a771 +refs/heads/master: 6782dfe44acedf1e583d84e9e0d4f966d8e9befa diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c index 748e140c5a18..b1b45eb42cb2 100644 --- a/trunk/drivers/dma/fsldma.c +++ b/trunk/drivers/dma/fsldma.c @@ -890,7 +890,8 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev, static void fsl_dma_chan_remove(struct fsl_dma_chan *fchan) { - free_irq(fchan->irq, fchan); + if (fchan->irq != NO_IRQ) + free_irq(fchan->irq, fchan); list_del(&fchan->common.device_node); iounmap(fchan->reg_base); kfree(fchan);