From 2a8ae94a02f7a512be91f4922083237d16ac0e1a Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Tue, 13 Mar 2012 23:17:43 +0000 Subject: [PATCH] --- yaml --- r: 294277 b: refs/heads/master c: f9b4a5ce1a6b3154ff857e17d031473e0bac72d2 h: refs/heads/master i: 294275: d7f4b93ec74c683d5f6c3baba851581148418baf v: v3 --- [refs] | 2 +- trunk/drivers/video/pvr2fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54a14c2ec88a..9b9572f766fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af89956be14ae5bb304872756a47309edc2c94fb +refs/heads/master: f9b4a5ce1a6b3154ff857e17d031473e0bac72d2 diff --git a/trunk/drivers/video/pvr2fb.c b/trunk/drivers/video/pvr2fb.c index 3a3fdc62c75b..bcd44c32a2ed 100644 --- a/trunk/drivers/video/pvr2fb.c +++ b/trunk/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