diff options
| author | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2017-08-17 22:16:48 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2017-08-29 21:10:37 +0200 |
| commit | 390c97dc6e346b65df61c18fade67577896382fd (patch) | |
| tree | 14da6e137a3bb47c754eb454eb24579eef4841d1 /drivers/leds | |
| parent | 430e48ecf31f4f897047f22e02abdfa75730cad8 (diff) | |
| download | op-kernel-dev-390c97dc6e346b65df61c18fade67577896382fd.zip op-kernel-dev-390c97dc6e346b65df61c18fade67577896382fd.tar.gz | |
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: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Reported-by: Colin King <colin.king@canonical.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Suggested-by: Nate Case <ncase@xes-inc.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-pca955x.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index f062d1e..09303fd 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c @@ -473,10 +473,14 @@ static int pca955x_probe(struct i2c_client *client, * Platform data can specify LED names and * default triggers */ - if (pdata->leds[i].name) - snprintf(pca955x_led->name, - sizeof(pca955x_led->name), "pca955x:%s", - 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, + sizeof(pca955x_led->name), "pca955x:%s", + pdata->leds[i].name); + if (pdata->leds[i].default_trigger) pca955x_led->led_cdev.default_trigger = pdata->leds[i].default_trigger; |
