Commit 390c97dc authored by Jacek Anaszewski's avatar Jacek Anaszewski

leds: pca955x: Prevent crippled LED device name

In case platform data provided empty LED name string the resulting
LED class device name would be crippled. Use corresponding LED chip
bit in place of "function" segment of LED class device name then to
make the LEDs at least distinguishable.
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Reported-by: default avatarColin King <colin.king@canonical.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Suggested-by: default avatarNate Case <ncase@xes-inc.com>
parent 430e48ec
...@@ -473,10 +473,14 @@ static int pca955x_probe(struct i2c_client *client, ...@@ -473,10 +473,14 @@ static int pca955x_probe(struct i2c_client *client,
* Platform data can specify LED names and * Platform data can specify LED names and
* default triggers * default triggers
*/ */
if (pdata->leds[i].name) if (pdata->leds[i].name[0] == '\0')
snprintf(pdata->leds[i].name,
sizeof(pdata->leds[i].name), "%d", i);
snprintf(pca955x_led->name, snprintf(pca955x_led->name,
sizeof(pca955x_led->name), "pca955x:%s", sizeof(pca955x_led->name), "pca955x:%s",
pdata->leds[i].name); pdata->leds[i].name);
if (pdata->leds[i].default_trigger) if (pdata->leds[i].default_trigger)
pca955x_led->led_cdev.default_trigger = pca955x_led->led_cdev.default_trigger =
pdata->leds[i].default_trigger; pdata->leds[i].default_trigger;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment