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

Commit baafacab authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Walleij
Browse files

pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data() 



In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). Fix by using devm_ioremap_resource instead of devm_ioremap.

Fixes: 8b1bd11c ("pinctrl: samsung: Add the support the multiple IORESOURCE_MEM for one pin-bank")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent aa1dd80f

drivers/pinctrl/samsung/pinctrl-samsung.c

+2 −3
Original line number Diff line number Diff line
@@ -988,10 +988,9 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, 


	for (i = 0; i < ctrl->nr_ext_resources + 1; i++) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		virt_base[i] = devm_ioremap(&pdev->dev, res->start,

						resource_size(res));

		virt_base[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(virt_base[i]))

			return ERR_PTR(-EIO);

			return ERR_CAST(virt_base[i]);

	}



	bank = d->pin_banks;