diff options
| author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2013-04-19 05:53:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-05-21 08:14:32 -0300 |
| commit | c8f089c9203e0061ecd27030518e7d06fea0edd8 (patch) | |
| tree | 12abb959ea438deb1a3bced78b9d18c341f17b8b | |
| parent | 012eef7001d4e0bede7122f34a4a6cc13a83c28e (diff) | |
| download | linux-c8f089c9203e0061ecd27030518e7d06fea0edd8.tar.bz2 | |
[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>
| -rw-r--r-- | drivers/media/platform/davinci/vpif_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index d8330567dd57..7b1736842690 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -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 @@ vpif_sd_error: } 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++) |