| Message ID | 20190403193050.22180-1-fparent@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] mmc: mtk-sd: check for valid optional memory resource | expand |
On Wed, 3 Apr 2019 at 21:31, Fabien Parent <fparent@baylibre.com> wrote: > > 'top_base' memory region is optional. Check that the resource is valid > before using it. This avoid getting a "invalid resource" error message > printed by the kernel. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> Applied for next, thanks! Kind regards Uffe > --- > > V2: > Fix invalid condition: check against 'res' variable instead of 'ret'. > > --- > drivers/mmc/host/mtk-sd.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 833ef0590af8..61bf8704491c 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2123,9 +2123,11 @@ static int msdc_drv_probe(struct platform_device *pdev) > } > > res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - host->top_base = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(host->top_base)) > - host->top_base = NULL; > + if (res) { > + host->top_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(host->top_base)) > + host->top_base = NULL; > + } > > ret = mmc_regulator_get_supply(mmc); > if (ret) > -- > 2.20.1 >
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 833ef0590af8..61bf8704491c 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2123,9 +2123,11 @@ static int msdc_drv_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - host->top_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(host->top_base)) - host->top_base = NULL; + if (res) { + host->top_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(host->top_base)) + host->top_base = NULL; + } ret = mmc_regulator_get_supply(mmc); if (ret)
'top_base' memory region is optional. Check that the resource is valid before using it. This avoid getting a "invalid resource" error message printed by the kernel. Signed-off-by: Fabien Parent <fparent@baylibre.com> --- V2: Fix invalid condition: check against 'res' variable instead of 'ret'. --- drivers/mmc/host/mtk-sd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)