Re: [PATCH] Revert "pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource leak in case of error in 'imx_pinctrl_probe()'"

[Marion & Christophe JAILLET <christophe.jaillet@wanadoo.fr>]

Le 08/06/2020 à 16:06, Aisheng Dong a écrit :
>> From: haibo.chen@nxp.com <haibo.chen@nxp.com>
>> Sent: Monday, June 8, 2020 6:00 PM
>>
>> This patch block system booting, find on imx7d-sdb board.
>>  From the dts we can see, iomux and iomux_lpsr share the memory region
>> [0x30330000-0x3033ffff], so will trigger the following issue:
>>
>> [    0.179561] imx7d-pinctrl 302c0000.iomuxc-lpsr: initialized IMX pinctrl
>> driver
>> [    0.191742] imx7d-pinctrl 30330000.pinctrl: can't request region for
>> resource [mem 0x30330000-0x3033ffff]
>> [    0.191842] imx7d-pinctrl: probe of 30330000.pinctrl failed with error -16
>>
>> This reverts commit ba403242615c2c99e27af7984b1650771a2cc2c9.
> Better add your sign-off.
> Otherwise:
> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

You can also add a "Apologies-From:" tag with my name :).
Sorry for this bogus patch.

CJ


> Maybe you or Christophe could resubmit another proper fix for the original issue.
>
> Regards
> Aisheng
>
>> ---
>>   drivers/pinctrl/freescale/pinctrl-imx.c | 7 +++----
>>   1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c
>> b/drivers/pinctrl/freescale/pinctrl-imx.c
>> index cb7e0f08d2cf..1f81569c7ae3 100644
>> --- a/drivers/pinctrl/freescale/pinctrl-imx.c
>> +++ b/drivers/pinctrl/freescale/pinctrl-imx.c
>> @@ -824,13 +824,12 @@ int imx_pinctrl_probe(struct platform_device *pdev,
>>   				return -EINVAL;
>>   			}
>>
>> -			ipctl->input_sel_base = devm_of_iomap(&pdev->dev, np,
>> -							      0, NULL);
>> +			ipctl->input_sel_base = of_iomap(np, 0);
>>   			of_node_put(np);
>> -			if (IS_ERR(ipctl->input_sel_base)) {
>> +			if (!ipctl->input_sel_base) {
>>   				dev_err(&pdev->dev,
>>   					"iomuxc input select base address not found\n");
>> -				return PTR_ERR(ipctl->input_sel_base);
>> +				return -ENOMEM;
>>   			}
>>   		}
>>   	}
>> --
>> 2.17.1