diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2011-06-12 13:15:29 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-15 02:49:17 -0400 |
commit | 1630d85a831273868651d46d74f069e0cdf9b698 (patch) | |
tree | fbff38e58bdc33582f4310bc21346c54cf44733f /drivers | |
parent | 4ee58461510221a53080afd02752838f93cc57fc (diff) |
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')
-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) | |||
1595 | struct au1200fb_device *fbdev; | 1595 | struct au1200fb_device *fbdev; |
1596 | struct fb_info *fbi = NULL; | 1596 | struct fb_info *fbi = NULL; |
1597 | unsigned long page; | 1597 | unsigned long page; |
1598 | int bpp, plane, ret; | 1598 | int bpp, plane, ret, irq; |
1599 | 1599 | ||
1600 | /* shut gcc up */ | 1600 | /* shut gcc up */ |
1601 | ret = 0; | 1601 | ret = 0; |
@@ -1671,10 +1671,12 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) | |||
1671 | } | 1671 | } |
1672 | 1672 | ||
1673 | /* Now hook interrupt too */ | 1673 | /* Now hook interrupt too */ |
1674 | if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq, | 1674 | irq = platform_get_irq(dev, 0); |
1675 | IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) { | 1675 | ret = request_irq(irq, au1200fb_handle_irq, |
1676 | IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev); | ||
1677 | if (ret) { | ||
1676 | print_err("fail to request interrupt line %d (err: %d)", | 1678 | print_err("fail to request interrupt line %d (err: %d)", |
1677 | AU1200_LCD_INT, ret); | 1679 | irq, ret); |
1678 | goto failed; | 1680 | goto failed; |
1679 | } | 1681 | } |
1680 | 1682 | ||
@@ -1722,7 +1724,7 @@ static int __devexit au1200fb_drv_remove(struct platform_device *dev) | |||
1722 | _au1200fb_infos[plane] = NULL; | 1724 | _au1200fb_infos[plane] = NULL; |
1723 | } | 1725 | } |
1724 | 1726 | ||
1725 | free_irq(AU1200_LCD_INT, (void *)dev); | 1727 | free_irq(platform_get_irq(dev, 0), (void *)dev); |
1726 | 1728 | ||
1727 | return 0; | 1729 | return 0; |
1728 | } | 1730 | } |