diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-29 02:44:53 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-08-25 04:00:46 +0200 |
| commit | 3e7e8c18a15102c3042206c067356e6c39961725 (patch) | |
| tree | 962b5f6559168d92553f99b0ecb26e6e8a0bc7c6 /drivers/mmc | |
| parent | mmc: vub300: Staticize vub300_init_card (diff) | |
| download | linux-3e7e8c18a15102c3042206c067356e6c39961725.tar.xz linux-3e7e8c18a15102c3042206c067356e6c39961725.zip | |
mmc: jz4740: fix return value check in jz4740_mmc_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR(). Also there is already a error message within
devm_ioremap_resource(), so remove the dev_err call to avoid redundant
error message.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/jz4740_mmc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 0308c9f1cf52..d058f0c85f43 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -783,9 +783,8 @@ static int jz4740_mmc_probe(struct platform_device* pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->base = devm_ioremap_resource(&pdev->dev, res); - if (!host->base) { - ret = -EBUSY; - dev_err(&pdev->dev, "Failed to ioremap base memory\n"); + if (IS_ERR(host->base)) { + ret = PTR_ERR(host->base); goto err_free_host; } |