diff options
| author |   Manuel Lauss <manuel.lauss@googlemail.com> | 2011-06-12 17:15:29 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2011-06-15 15:49:17 +0900 |
| commit | 1630d85a831273868651d46d74f069e0cdf9b698 (patch) | |
| tree | fbff38e58bdc33582f4310bc21346c54cf44733f /drivers/video/au1200fb.c | |
| parent | au1200fb: switch to FB_SYS helpers (diff) | |
| download | linux-dev-1630d85a831273868651d46d74f069e0cdf9b698.tar.xz linux-dev-1630d85a831273868651d46d74f069e0cdf9b698.zip | |
au1200fb: fix hardcoded IRQ
Use the IRQ provided by platform resource information.
Required for Au1300 support.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/au1200fb.c')
| -rw-r--r-- | drivers/video/au1200fb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index b1b16d98c919..ed5dcdb29cf7 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c @@ -1595,7 +1595,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) struct au1200fb_device *fbdev; struct fb_info *fbi = NULL; unsigned long page; - int bpp, plane, ret; + int bpp, plane, ret, irq; /* shut gcc up */ ret = 0; @@ -1671,10 +1671,12 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) } /* Now hook interrupt too */ - if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq, - IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) { + irq = platform_get_irq(dev, 0); + ret = request_irq(irq, au1200fb_handle_irq, + IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev); + if (ret) { print_err("fail to request interrupt line %d (err: %d)", - AU1200_LCD_INT, ret); + irq, ret); goto failed; } @@ -1722,7 +1724,7 @@ static int __devexit au1200fb_drv_remove(struct platform_device *dev) _au1200fb_infos[plane] = NULL; } - free_irq(AU1200_LCD_INT, (void *)dev); + free_irq(platform_get_irq(dev, 0), (void *)dev); return 0; } |