]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fsldma: print correct IRQ on mpc83xx
authorPeter Korsgaard <jacmet@sunsite.dk>
Thu, 15 Jan 2009 05:33:31 +0000 (22:33 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 16 Jan 2009 06:50:22 +0000 (23:50 -0700)
The mpc83xx variant uses a shared IRQ for all channels, so the individual
channel nodes don't have an interrupt property. Fix the code to print the
controller IRQ instead if there isn't any for the channel.

Acked-by: Timur Tabi <timur@freescale.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dma/fsldma.c

index b1b45eb42cb2af0476a64f723c91af35ed9fa15d..70126a60623939dddc6af7a59aa7b1eac8a51637 100644 (file)
@@ -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;