From e06f976188fa29569c1a767f8747828190f84396 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Mon, 9 Nov 2009 09:15:07 -0300 Subject: [PATCH] --- yaml --- r: 174163 b: refs/heads/master c: 1ead696b4c1b719eeae313618bca89e7b37c7d9b h: refs/heads/master i: 174161: 59ff7c040de89ebfa70d90d6a82b1893133ec937 174159: db84b865227cd4fd2ace6534a77467d16524a00e v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/vpfe_capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b12be76428b..37d0d1b44d60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14cbaafe6f8587aed632de747322cd3add421a76 +refs/heads/master: 1ead696b4c1b719eeae313618bca89e7b37c7d9b diff --git a/trunk/drivers/media/video/davinci/vpfe_capture.c b/trunk/drivers/media/video/davinci/vpfe_capture.c index 86f7e75f12c5..1c3bde7fcd5e 100644 --- a/trunk/drivers/media/video/davinci/vpfe_capture.c +++ b/trunk/drivers/media/video/davinci/vpfe_capture.c @@ -660,7 +660,7 @@ static void vpfe_detach_irq(struct vpfe_device *vpfe_dev) frame_format = ccdc_dev->hw_ops.get_frame_format(); if (frame_format == CCDC_FRMFMT_PROGRESSIVE) - free_irq(IRQ_VDINT1, vpfe_dev); + free_irq(vpfe_dev->ccdc_irq1, vpfe_dev); } static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)