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

Commit 9a4f4245 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Linus Walleij
Browse files

pinctrl: freescale: imx: fix bogus check of of_iomap() return value 



On error path of_iomap() returns NULL, hence IS_ERR() check is invalid
and may cause a NULL pointer dereference, the change fixes this
problem.

While we are here invert a device node check to simplify the code.

Fixes: 26d8cde5 ("pinctrl: freescale: imx: add shared input select reg support")
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5e7515ba

drivers/pinctrl/freescale/pinctrl-imx.c

+8 −9
Original line number Diff line number Diff line
@@ -762,19 +762,18 @@ int imx_pinctrl_probe(struct platform_device *pdev, 


	if (of_property_read_bool(dev_np, "fsl,input-sel")) {

		np = of_parse_phandle(dev_np, "fsl,input-sel", 0);

		if (np) {

		if (!np) {

			dev_err(&pdev->dev, "iomuxc fsl,input-sel property not found\n");

			return -EINVAL;

		}



		ipctl->input_sel_base = of_iomap(np, 0);

			if (IS_ERR(ipctl->input_sel_base)) {

		of_node_put(np);

		if (!ipctl->input_sel_base) {

			dev_err(&pdev->dev,

				"iomuxc input select base address not found\n");

				return PTR_ERR(ipctl->input_sel_base);

			}

		} else {

			dev_err(&pdev->dev, "iomuxc fsl,input-sel property not found\n");

			return -EINVAL;

			return -ENOMEM;

		}

		of_node_put(np);

	}



	imx_pinctrl_desc.name = dev_name(&pdev->dev);