aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorManjunath Hadli <manjunath.hadli@ti.com>2012-04-13 03:44:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:01:44 -0400
commit0316b89ae0de139875594d7fa0527cb5af69bd69 (patch)
tree300ee57f10f6a7c73a6802b37a810f6f939af7dc /drivers
parent0a63172a8abc135791c73fc418a20ea379745ae6 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/davinci/vpif_capture.c2
-rw-r--r--drivers/media/video/davinci/vpif_display.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index f31c1661cd56..bce31ea55dc4 100644
--- 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)
2189 k = 0; 2189 k = 0;
2190 while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) { 2190 while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
2191 for (i = res->start; i <= res->end; i++) { 2191 for (i = res->start; i <= res->end; i++) {
2192 if (request_irq(i, vpif_channel_isr, IRQF_DISABLED, 2192 if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
2193 "VPIF_Capture", 2193 "VPIF_Capture",
2194 (void *)(&vpif_obj.dev[k]->channel_id))) { 2194 (void *)(&vpif_obj.dev[k]->channel_id))) {
2195 err = -EBUSY; 2195 err = -EBUSY;
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 8d8f3b4e558f..1d0c18ab7922 100644
--- 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)
1709 k = 0; 1709 k = 0;
1710 while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) { 1710 while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
1711 for (i = res->start; i <= res->end; i++) { 1711 for (i = res->start; i <= res->end; i++) {
1712 if (request_irq(i, vpif_channel_isr, IRQF_DISABLED, 1712 if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
1713 "VPIF_Display", 1713 "VPIF_Display",
1714 (void *)(&vpif_obj.dev[k]->channel_id))) { 1714 (void *)(&vpif_obj.dev[k]->channel_id))) {
1715 err = -EBUSY; 1715 err = -EBUSY;