Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30e3488c authored by Wei Yongjun's avatar Wei Yongjun Committed by Tony Lindgren
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b357787e

arch/arm/mach-omap2/gpmc-smsc911x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

	pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id,

		 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),

		 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),

		 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));

		 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));

	if (!pdev) {

	if (IS_ERR(pdev)) {

		pr_err("Unable to register platform device\n");

		pr_err("Unable to register platform device\n");

		gpio_free(gpmc_cfg->gpio_reset);

		gpio_free(gpmc_cfg->gpio_reset);

		goto free2;

		goto free2;