[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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Родитель
9626d03e8d
Коммит
375123976f
|
@ -899,9 +899,10 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
|
||||||
}
|
}
|
||||||
|
|
||||||
err = v4l2_of_parse_endpoint(np, &ep);
|
err = v4l2_of_parse_endpoint(np, &ep);
|
||||||
|
of_node_put(np);
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(&pdev->dev, "Could not parse the endpoint\n");
|
dev_err(&pdev->dev, "Could not parse the endpoint\n");
|
||||||
goto err_probe_dt;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (ep.bus.parallel.bus_width) {
|
switch (ep.bus.parallel.bus_width) {
|
||||||
|
@ -915,14 +916,10 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
|
||||||
default:
|
default:
|
||||||
dev_err(&pdev->dev, "Unsupported bus width: %d\n",
|
dev_err(&pdev->dev, "Unsupported bus width: %d\n",
|
||||||
ep.bus.parallel.bus_width);
|
ep.bus.parallel.bus_width);
|
||||||
err = -EINVAL;
|
return -EINVAL;
|
||||||
goto err_probe_dt;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err_probe_dt:
|
return 0;
|
||||||
of_node_put(np);
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int atmel_isi_probe(struct platform_device *pdev)
|
static int atmel_isi_probe(struct platform_device *pdev)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче