p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] media: davinci: vpif_display: move displaying of error to approppraite place 

this patch moves the displaying out error case  "VPIF IRQ request failed\n"
when there is actual request_irq() fail.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-04-19 05:53:30 -03:00 committed by Mauro Carvalho Chehab
parent 012eef7001
commit c8f089c920
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/davinci/vpif_display.c
View File

@ -1725,6 +1725,7 @@ static __init int vpif_probe(struct platform_device *pdev)
for (j = 0; j < i; j++)
free_irq(j, (void *)
(&vpif_obj.dev[res_idx]->channel_id));
vpif_err("VPIF IRQ request failed\n");
goto vpif_int_err;
}
}
@ -1878,7 +1879,6 @@ static __init int vpif_probe(struct platform_device *pdev)
}
vpif_int_err:
v4l2_device_unregister(&vpif_obj.v4l2_dev);
vpif_err("VPIF IRQ request failed\n");
for (i = 0; i < res_idx; i++) {
res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
for (j = res->start; j <= res->end; j++)