Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / video / pvr2fb.c

diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 3a3fdc62c75b354c08f461b4ab92c1f05e0d5f2d..bcd44c32a2ed501474925b9c373af1cb9b50aee4 100644 (file)
--- 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