platform/mellanox: nvsw-sn2201: fix error code in nvsw_sn2201_create_static_devices()

Dan Carpenter · jwrdegoede · commit 79e90ca02d7d · 2022-06-27T09:38:56.000+02:00
This should return PTR_ERR() instead of IS_ERR(). Also "dev->client" has been set to NULL by this point so it returns 0/success so preserve the error code earlier. Fixes: 662f248 ("platform/mellanox: Add support for new SN2201 system") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Michael Shych <michaelsh@nvidia.com> Link: https://lore.kernel.org/r/YqmUGwmPK7cPolk/@kili Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/drivers/platform/mellanox/nvsw-sn2201.c b/drivers/platform/mellanox/nvsw-sn2201.c
@@ -890,6 +890,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,
 				  int size)
 {
 	struct mlxreg_hotplug_device *dev = devs;
+	int ret;
 	int i;
 
 	/* Create I2C static devices. */
@@ -901,6 +902,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,
 				dev->nr, dev->brdinfo->addr);
 
 			dev->adapter = NULL;
+			ret = PTR_ERR(dev->client);
 			goto fail_create_static_devices;
 		}
 	}
@@ -914,7 +916,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,
 		dev->client = NULL;
 		dev->adapter = NULL;
 	}
-	return IS_ERR(dev->client);
+	return ret;
 }
 
 static void nvsw_sn2201_destroy_static_devices(struct nvsw_sn2201 *nvsw_sn2201,

Original file line number	Diff line number	Diff line change
`@@ -890,6 +890,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,`
`890`	`890`	`int size)`
`891`	`891`	`{`
`892`	`892`	`struct mlxreg_hotplug_device *dev = devs;`
	`893`	`+ int ret;`
`893`	`894`	`int i;`
`894`	`895`
`895`	`896`	`/* Create I2C static devices. */`
`@@ -901,6 +902,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,`
`901`	`902`	`dev->nr, dev->brdinfo->addr);`
`902`	`903`
`903`	`904`	`dev->adapter = NULL;`
	`905`	`+ ret = PTR_ERR(dev->client);`
`904`	`906`	`goto fail_create_static_devices;`
`905`	`907`	`}`
`906`	`908`	`}`
`@@ -914,7 +916,7 @@ nvsw_sn2201_create_static_devices(struct nvsw_sn2201 *nvsw_sn2201,`
`914`	`916`	`dev->client = NULL;`
`915`	`917`	`dev->adapter = NULL;`
`916`	`918`	`}`
`917`		`- return IS_ERR(dev->client);`
	`919`	`+ return ret;`
`918`	`920`	`}`
`919`	`921`
`920`	`922`	`static void nvsw_sn2201_destroy_static_devices(struct nvsw_sn2201 *nvsw_sn2201,`