From: David Brownell Date: Fri, 6 Mar 2009 00:46:44 +0000 (-0800) Subject: leds: just ignore invalid GPIOs in leds-gpio X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d379ee8acd0719736ee7f1d1ccc3b5765880eaf8;p=linux-2.6-omap-h63xx.git leds: just ignore invalid GPIOs in leds-gpio 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 Tested-by: Diego Dompe Signed-off-by: Richard Purdie --- diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 8fa352ac20f..102ef4a14c5 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -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; @@ -114,6 +121,8 @@ err: 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);