]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 25 Oct 2013 09:31:51 +0000 (17:31 +0800)
committerTony Lindgren <tony@atomide.com>
Thu, 14 Nov 2013 18:40:36 +0000 (10:40 -0800)
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>
arch/arm/mach-omap2/gpmc-smsc911x.c

index ef990118d32b2f4205c25c58aec555465096aa39..2757504a13c42ae11319f9f72f4fa6ba50babd29 100644 (file)
@@ -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;