MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: pca995x: Fix device child node usage in pca995x_probe()

Browse Source 
The current implementation accesses the `child` fwnode handle outside of
device_for_each_child_node() without incrementing its refcount.

Add the missing call to `fwnode_handle_get(child)`.

The cleanup process where `child` is accessed is not right either
because a single call to `fwnode_handle_put()` is carried out in case of
an error, ignoring unasigned nodes at the point when the error happens.

Keep `child` inside of the first loop, and use the helper pointer that
receives references via `fwnode_handle_get()` to handle the child nodes
within the second loop. Keeping `child` inside the first node has also
the advantage that the scoped version of the loop can be used.

Fixes: ee4e80b296 ("leds: pca995x: Add support for PCA995X chips")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20240807-leds-pca995x-fix-fwnode-usage-v1-1-8057c84dc583@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Javier Carrasco 2024-08-07 15:37:03 +02:00 committed by Lee Jones
parent 616dbed654
commit 82c5ada1f9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/leds/leds-pca995x.c
View File

@ -120,12 +120,11 @@ static const struct regmap_config pca995x_regmap = {
static int pca995x_probe(struct i2c_client *client) static int pca995x_probe(struct i2c_client *client)
{ {
struct fwnode_handle *led_fwnodes[PCA995X_MAX_OUTPUTS] = { 0 }; struct fwnode_handle *led_fwnodes[PCA995X_MAX_OUTPUTS] = { 0 };
struct fwnode_handle *child;
struct device *dev = &client->dev; struct device *dev = &client->dev;
const struct pca995x_chipdef *chipdef; const struct pca995x_chipdef *chipdef;
struct pca995x_chip *chip; struct pca995x_chip *chip;
struct pca995x_led *led; struct pca995x_led *led;
int i, reg, ret; int i, j, reg, ret;
chipdef = device_get_match_data(&client->dev); chipdef = device_get_match_data(&client->dev);
@ -143,7 +142,7 @@ static int pca995x_probe(struct i2c_client *client)
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, chip);
device_for_each_child_node(dev, child) { device_for_each_child_node_scoped(dev, child) {
ret = fwnode_property_read_u32(child, "reg", &reg); ret = fwnode_property_read_u32(child, "reg", &reg);
if (ret) if (ret)
return ret; return ret;
@ -152,7 +151,7 @@ static int pca995x_probe(struct i2c_client *client)
return -EINVAL; return -EINVAL;
led = &chip->leds[reg]; led = &chip->leds[reg];
led_fwnodes[reg] = child; led_fwnodes[reg] = fwnode_handle_get(child);
led->chip = chip; led->chip = chip;
led->led_no = reg; led->led_no = reg;
led->ldev.brightness_set_blocking = pca995x_brightness_set; led->ldev.brightness_set_blocking = pca995x_brightness_set;
@ -171,7 +170,8 @@ static int pca995x_probe(struct i2c_client *client)
&chip->leds[i].ldev, &chip->leds[i].ldev,
&init_data); &init_data);
if (ret < 0) { if (ret < 0) {
fwnode_handle_put(child); for (j = i; j < PCA995X_MAX_OUTPUTS; j++)
fwnode_handle_put(led_fwnodes[j]);
return dev_err_probe(dev, ret, return dev_err_probe(dev, ret,
"Could not register LED %s\n", "Could not register LED %s\n",
chip->leds[i].ldev.name); chip->leds[i].ldev.name);