Skip to content

Commit

Permalink
leds: just ignore invalid GPIOs in leds-gpio
Browse files Browse the repository at this point in the history
Sometimes it's awkward to make sure that the array in the
platform_data handed to the leds-gpio driver has only valid
data ... some leds may not be always available, and coping
with that currently requires patching or rebuilding the array.

This patch fixes that by making it be OK to pass an invalid
GPIO (such as "-EINVAL") ... such table entries are skipped.

[rpurdie@linux.intel.com: adjusted to apply against other led tree changes]
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Tested-by: Diego Dompe <diego.dompe@ridgerun.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
  • Loading branch information
David Brownell authored and Richard Purdie committed Apr 6, 2009
1 parent 7fbc3a9 commit d379ee8
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/leds/leds-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ static int __devinit create_gpio_led(const struct gpio_led *template,
{
int ret;

/* skip leds that aren't available */
if (!gpio_is_valid(template->gpio)) {
printk(KERN_INFO "Skipping unavilable LED gpio %d (%s)\n",
template->gpio, template->name);
return;
}

ret = gpio_request(template->gpio, template->name);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -114,6 +121,8 @@ static int __devinit create_gpio_led(const struct gpio_led *template,

static void delete_gpio_led(struct gpio_led_data *led)
{
if (!gpio_is_valid(led->gpio))
return;
led_classdev_unregister(&led->cdev);
cancel_work_sync(&led->work);
gpio_free(led->gpio);
Expand Down

0 comments on commit d379ee8

Please sign in to comment.