diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-15 06:33:31 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-16 07:50:22 +0100 |
| commit | 169d5f663759ec494aa74a552ce99486235e6e50 (patch) | |
| tree | af5947b705412c99a7f24d9f26104a6ee1132605 /drivers/dma | |
| parent | fsldma: check for NO_IRQ in fsl_dma_chan_remove() (diff) | |
| download | linux-169d5f663759ec494aa74a552ce99486235e6e50.tar.xz linux-169d5f663759ec494aa74a552ce99486235e6e50.zip | |
fsldma: print correct IRQ on mpc83xx
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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsldma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index b1b45eb42cb2..70126a606239 100644 --- a/drivers/dma/fsldma.c +++ b/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; |