| Message ID | 1547617491-60322-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 9a633f3bfb9784fe4d12c0349e9d887e36b4a9e0 |
| Headers | show |
| Series | [-next] mmc: sdhci-esdhc-imx: fix return value check in sdhci_esdhc_imx_probe() | expand |
On 16/01/19 7:44 AM, Wei Yongjun wrote: > In case of error, the function devm_kzalloc() returns NULL pointer not > ERR_PTR(). The IS_ERR() test in the return value check should be > replaced with NULL test. > > Fixes: fadac7488064 ("mmc: sdhci-esdhc-imx: add CMDQ support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 75ad824..fad6007 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1500,8 +1500,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > if (imx_data->socdata->flags & ESDHC_FLAG_CQHCI) { > host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD; > cq_host = devm_kzalloc(&pdev->dev, sizeof(*cq_host), GFP_KERNEL); > - if (IS_ERR(cq_host)) { > - err = PTR_ERR(cq_host); > + if (!cq_host) { > + err = -ENOMEM; > goto disable_ahb_clk; > } > > > >
On Wed, 16 Jan 2019 at 06:38, Wei Yongjun <weiyongjun1@huawei.com> wrote: > > In case of error, the function devm_kzalloc() returns NULL pointer not > ERR_PTR(). The IS_ERR() test in the return value check should be > replaced with NULL test. > > Fixes: fadac7488064 ("mmc: sdhci-esdhc-imx: add CMDQ support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 75ad824..fad6007 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1500,8 +1500,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > if (imx_data->socdata->flags & ESDHC_FLAG_CQHCI) { > host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD; > cq_host = devm_kzalloc(&pdev->dev, sizeof(*cq_host), GFP_KERNEL); > - if (IS_ERR(cq_host)) { > - err = PTR_ERR(cq_host); > + if (!cq_host) { > + err = -ENOMEM; > goto disable_ahb_clk; > } > > >
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 75ad824..fad6007 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1500,8 +1500,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) if (imx_data->socdata->flags & ESDHC_FLAG_CQHCI) { host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD; cq_host = devm_kzalloc(&pdev->dev, sizeof(*cq_host), GFP_KERNEL); - if (IS_ERR(cq_host)) { - err = PTR_ERR(cq_host); + if (!cq_host) { + err = -ENOMEM; goto disable_ahb_clk; }
In case of error, the function devm_kzalloc() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: fadac7488064 ("mmc: sdhci-esdhc-imx: add CMDQ support") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)