ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
Subsystems (5)
PATCH 1/1 ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
From: Wei Yongjun <[email protected]>
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().
--- arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/gpmc-smsc911x.c +1 -1
@@ -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;
PATCH 1/1 ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
Quoted 7 lines · Wei Yongjun
From: Wei Yongjun <[email protected]>
In case of error, the function
platform_device_register_resndata()returnsERR_PTR()and never returns NULL. The NULL test in the return value check should be replaced withIS_ERR().Signed-off-by Wei Yongjun <[email protected]>
Quoted 23 lines
--- arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-omap2/gpmc-smsc911x.c +1
-2@@ -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; --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Regards, Igor.
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
Quoted 10 lines · Igor Grinberg
Quoted 7 lines · Wei Yongjun
From: Wei Yongjun <[email protected]>
In case of error, the function
platform_device_register_resndata()returnsERR_PTR()and never returns NULL. The NULL test in the return value check should be replaced withIS_ERR().Signed-off-by Wei Yongjun <[email protected]>Acked-by Igor Grinberg <[email protected]>
Thanks applying into omap-for-v3.13/fixes.
Tony
Quoted 27 lines
Quoted 23 lines
--- arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-omap2/gpmc-smsc911x.c +1
-2@@ -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; --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.htmlSignature · 2 lines
Regards, Igor.