Browse Source

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>
Jacek Anaszewski 8 years ago
parent
commit
390c97dc6e
1 changed files with 8 additions and 4 deletions
  1. 8 4
      drivers/leds/leds-pca955x.c

+ 8 - 4
drivers/leds/leds-pca955x.c

@@ -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)
-				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)
 			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;