Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1630d85a authored by Manuel Lauss's avatar Manuel Lauss Committed by Paul Mundt
Browse files

au1200fb: fix hardcoded IRQ 



Use the IRQ provided by platform resource information.
Required for Au1300 support.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4ee58461

drivers/video/au1200fb.c

+7 −5
Original line number Diff line number Diff line
@@ -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;

}