platform/mellanox: mlxreg-lc: fix error code in mlxreg_lc_create_static_devices()

Dan Carpenter · jwrdegoede · commit 287273a80be5 · 2021-11-16T10:19:46.000+01:00
This code should be using PTR_ERR() instead of IS_ERR(). And because it's using the wrong "dev->client" pointer, the IS_ERR() check will be false, meaning the function returns success. Fixes: 62f9529 ("platform/mellanox: mlxreg-lc: Add initial support for Nvidia line card devices") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Vadim Pasternak <vadimp@nvidia.com> Link: https://lore.kernel.org/r/20211110074346.GB5176@kili Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/drivers/platform/mellanox/mlxreg-lc.c b/drivers/platform/mellanox/mlxreg-lc.c
@@ -413,7 +413,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl
 				int size)
 {
 	struct mlxreg_hotplug_device *dev = devs;
-	int i;
+	int i, ret;
 
 	/* Create static I2C device feeding by auxiliary or main power. */
 	for (i = 0; i < size; i++, dev++) {
@@ -423,6 +423,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl
 				dev->brdinfo->type, dev->nr, dev->brdinfo->addr);
 
 			dev->adapter = NULL;
+			ret = PTR_ERR(dev->client);
 			goto fail_create_static_devices;
 		}
 	}
@@ -435,7 +436,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl
 		i2c_unregister_device(dev->client);
 		dev->client = NULL;
 	}
-	return IS_ERR(dev->client);
+	return ret;
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl`
`413`	`413`	`int size)`
`414`	`414`	`{`
`415`	`415`	`struct mlxreg_hotplug_device *dev = devs;`
`416`		`- int i;`
	`416`	`+ int i, ret;`
`417`	`417`
`418`	`418`	`/* Create static I2C device feeding by auxiliary or main power. */`
`419`	`419`	`for (i = 0; i < size; i++, dev++) {`
`@@ -423,6 +423,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl`
`423`	`423`	`dev->brdinfo->type, dev->nr, dev->brdinfo->addr);`
`424`	`424`
`425`	`425`	`dev->adapter = NULL;`
	`426`	`+ ret = PTR_ERR(dev->client);`
`426`	`427`	`goto fail_create_static_devices;`
`427`	`428`	`}`
`428`	`429`	`}`
`@@ -435,7 +436,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl`
`435`	`436`	`i2c_unregister_device(dev->client);`
`436`	`437`	`dev->client = NULL;`
`437`	`438`	`}`
`438`		`- return IS_ERR(dev->client);`
	`439`	`+ return ret;`
`439`	`440`	`}`
`440`	`441`
`441`	`442`	`static void`