Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8f089c9 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 012eef70

drivers/media/platform/davinci/vpif_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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++)