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

Commit 37512397 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: atmel-isi: Simplify error handling during DT parsing 



Put the endpoint DT node earlier to avoid the need for goto statements
to a cleanup code block in case of errors.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9626d03e

drivers/media/platform/soc_camera/atmel-isi.c

+4 −7
Original line number Diff line number Diff line
@@ -899,9 +899,10 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi, 
	}



	err = v4l2_of_parse_endpoint(np, &ep);

	of_node_put(np);

	if (err) {

		dev_err(&pdev->dev, "Could not parse the endpoint\n");

		goto err_probe_dt;

		return err;

	}



	switch (ep.bus.parallel.bus_width) {
@@ -915,14 +916,10 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi, 
	default:

		dev_err(&pdev->dev, "Unsupported bus width: %d\n",

				ep.bus.parallel.bus_width);

		err = -EINVAL;

		goto err_probe_dt;

		return -EINVAL;

	}



err_probe_dt:

	of_node_put(np);



	return err;

	return 0;

}



static int atmel_isi_probe(struct platform_device *pdev)