summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-03-11 20:36:21 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-13 23:17:31 +0000
commitafb0499b0e43e2ee71a92bec9331635dc1173a07 (patch)
tree1120ecb03f6a530ecb248760aeb6a24190ec02d0 /drivers/video
parentc2bc0a756b1f98bd712fabe78eb49d7d5ae72075 (diff)
downloadlinux-3.10-afb0499b0e43e2ee71a92bec9331635dc1173a07.tar.gz
linux-3.10-afb0499b0e43e2ee71a92bec9331635dc1173a07.tar.bz2
linux-3.10-afb0499b0e43e2ee71a92bec9331635dc1173a07.zip
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
Convert calls to free_irq so that the second argument is the same as the last argument of the corresponding call to request_irq. Without this property, free_irq does nothing. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/pvr2fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 3a3fdc62c75..bcd44c32a2e 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -895,7 +895,7 @@ static int __init pvr2fb_dc_init(void)
#ifdef CONFIG_PVR2_DMA
if (request_dma(pvr2dma, "pvr2") != 0) {
- free_irq(HW_EVENT_VSYNC, 0);
+ free_irq(HW_EVENT_VSYNC, fb_info);
return -EBUSY;
}
#endif
@@ -914,7 +914,7 @@ static void __exit pvr2fb_dc_exit(void)
currentpar->mmio_base = 0;
}
- free_irq(HW_EVENT_VSYNC, 0);
+ free_irq(HW_EVENT_VSYNC, fb_info);
#ifdef CONFIG_PVR2_DMA
free_dma(pvr2dma);
#endif