diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-25 17:31:51 +0800 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2013-11-14 10:40:36 -0800 |
| commit | 30e3488cbfe6e8af0832be715081c49b08299b73 (patch) | |
| tree | f0c50de41c928d842b11290edb6b1bc63dc4643a | |
| parent | Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into xxx-dt (diff) | |
| download | linux-dev-30e3488cbfe6e8af0832be715081c49b08299b73.tar.xz linux-dev-30e3488cbfe6e8af0832be715081c49b08299b73.zip | |
ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
In case of error, the function platform_device_register_resndata()
returns ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/gpmc-smsc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c index ef990118d32b..2757504a13c4 100644 --- a/arch/arm/mach-omap2/gpmc-smsc911x.c +++ b/arch/arm/mach-omap2/gpmc-smsc911x.c @@ -83,7 +83,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *gpmc_cfg) pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id, gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources), &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config)); - if (!pdev) { + if (IS_ERR(pdev)) { pr_err("Unable to register platform device\n"); gpio_free(gpmc_cfg->gpio_reset); goto free2; |