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

Commit dd5747fb authored by Fabio Estevam's avatar Fabio Estevam Committed by Mauro Carvalho Chehab
Browse files

media: imx-media-csi: Do not propagate the error when pinctrl is not found 



Since commit 52e17089 ("media: imx: Don't initialize vars that
won't be used") imx_csi_probe() fails to probe after propagating the
devm_pinctrl_get_select_default() error.

devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
entry is not found, so better not to propagate the error in the -ENODEV
case to avoid a regression.

Suggested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent cccc41fd

drivers/staging/media/imx/imx-media-csi.c

+4 −1
Original line number Diff line number Diff line
@@ -1800,6 +1800,9 @@ static int imx_csi_probe(struct platform_device *pdev) 
	pinctrl = devm_pinctrl_get_select_default(priv->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(priv->vdev);

		dev_dbg(priv->dev,

			"devm_pinctrl_get_select_default() failed: %d\n", ret);

		if (ret != -ENODEV)

			goto free;

	}