On 12 September 2013 13:19, Viresh Kumar <[email protected]> wrote:
> On 12 September 2013 12:13, Sachin Kamat <[email protected]> wrote:
>> pdata could be NULL if cd_gpio = -1. Hence move the NULL check
>> outside the if condition.
>>
>> Signed-off-by: Sachin Kamat <[email protected]>
>> Cc: Viresh Kumar <[email protected]>
>> ---
>> Only compile tested.
>> ---
>> drivers/mmc/host/sdhci-spear.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
>> index 2dba9f8..4f3557a 100644
>> --- a/drivers/mmc/host/sdhci-spear.c
>> +++ b/drivers/mmc/host/sdhci-spear.c
>> @@ -82,12 +82,12 @@ static struct sdhci_plat_data
>> *sdhci_probe_config_dt(struct platform_device *pde
>> cd_gpio = -1;
>>
>> /* If pdata is required */
>> - if (cd_gpio != -1) {
>> + if (cd_gpio != -1)
>> pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
>> - if (!pdata) {
>> - dev_err(&pdev->dev, "DT: kzalloc failed\n");
>> - return ERR_PTR(-ENOMEM);
>> - }
>> +
>> + if (!pdata) {
>> + dev_err(&pdev->dev, "pdata is NULL\n");
>> + return ERR_PTR(-ENOMEM);
>> }
>>
>> pdata->card_int_gpio = cd_gpio;
>
> Or better move above line in the if block? We are already printing
> error in probe..
Yes. That was my second option. If we do that we would get something as below:
84 /* If pdata is required */
85 if (cd_gpio != -1) {
86 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
87 if (!pdata) {
88 dev_err(&pdev->dev, "DT: kzalloc failed\n");
89 goto out;
90 }
91 pdata->card_int_gpio = cd_gpio;
92 return pdata;
93 }
94
95 out:
96 return ERR_PTR(-ENODATA);
Does this look OK?
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
