[media] davinci: vpif: make request_irq flags as shared

omap-l138 shares the interrupt between capture and display.
Make sure we are able to request for the same irq number
by making a shared irq request.

Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index f31c1661cd56621a010142eb2062f7acccf299b5..bce31ea55dc4f15e7b231b0e0416084034a40220 100644 (file)
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -2189,7 +2189,7 @@ static __init int vpif_probe(struct platform_device *pdev)
        k = 0;
        while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
                for (i = res->start; i <= res->end; i++) {
-                       if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+                       if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
                                        "VPIF_Capture",
                                (void *)(&vpif_obj.dev[k]->channel_id))) {
                                err = -EBUSY;

diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 8d8f3b4e558f9aef9f86d15d9759452e8528ca20..1d0c18ab7922e79e55050769587bb5818e34a680 100644 (file)
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -1709,7 +1709,7 @@ static __init int vpif_probe(struct platform_device *pdev)
        k = 0;
        while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
                for (i = res->start; i <= res->end; i++) {
-                       if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+                       if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
                                        "VPIF_Display",
                                (void *)(&vpif_obj.dev[k]->channel_id))) {
                                err = -EBUSY;