[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>

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index d8330567dd57cc6ae228db2f715ce29dddfb7962..7b1736842690ad70b52412825c0886ff3be1b2a7 100644 (file)
--- 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++)