From dc55ef17bd1b23cf85d462e819e0c59e2ab4b542 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Jan 2009 22:33:31 -0700
Subject: [PATCH] --- yaml --- r: 130064 b: refs/heads/master c:
 169d5f663759ec494aa74a552ce99486235e6e50 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/dma/fsldma.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae62953a72f5..6ea81431703c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6782dfe44acedf1e583d84e9e0d4f966d8e9befa
+refs/heads/master: 169d5f663759ec494aa74a552ce99486235e6e50
diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c
index b1b45eb42cb2..70126a606239 100644
--- a/trunk/drivers/dma/fsldma.c
+++ b/trunk/drivers/dma/fsldma.c
@@ -875,7 +875,8 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
 	}
 
 	dev_info(fdev->dev, "#%d (%s), irq %d\n", new_fsl_chan->id,
-				compatible, new_fsl_chan->irq);
+		 compatible,
+		 new_fsl_chan->irq != NO_IRQ ? new_fsl_chan->irq : fdev->irq);
 
 	return 0;