On 12 September 2013 14:54, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote:
> On 12 September 2013 14:34, Sachin Kamat <sachin.kamat@xxxxxxxxxx> wrote:
>> pdata could be NULL if cd_gpio = -1. Dereference pdata only
>> if it is not NULL.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
>> Cc: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
>> ---
>> Compile tested.
>> Changes since v1:
>> * Moved the pdata assignment inside if condition.
>> ---
>> drivers/mmc/host/sdhci-spear.c | 8 +++-----
>> 1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
>> index 2dba9f8..76ddd89 100644
>> --- a/drivers/mmc/host/sdhci-spear.c
>> +++ b/drivers/mmc/host/sdhci-spear.c
>> @@ -84,14 +84,12 @@ static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pde
>> /* If pdata is required */
>> if (cd_gpio != -1) {
>> pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
>> - if (!pdata) {
>> + if (!pdata)
>> dev_err(&pdev->dev, "DT: kzalloc failed\n");
>> - return ERR_PTR(-ENOMEM);
>> - }
>> + else
>> + pdata->card_int_gpio = cd_gpio;
>> }
>>
>> - pdata->card_int_gpio = cd_gpio;
>> -
>> return pdata;
>> }
>> #else
>
> Acked-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Ping Chris.
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
