summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Povey <jon.povey@racelogic.co.uk>2010-07-27 13:18:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-27 14:32:07 -0700
commit6a99ad4a2e1b1693ffe8e40cc0dddfc633ce2a50 (patch)
tree7125466673bfe462b3ffbaf85b31cb66906d22cd
parent952e1c6632ab5060a2323624d2908f31d62fc0a3 (diff)
downloadop-kernel-dev-6a99ad4a2e1b1693ffe8e40cc0dddfc633ce2a50.zip
op-kernel-dev-6a99ad4a2e1b1693ffe8e40cc0dddfc633ce2a50.tar.gz
gpio: fix spurious printk when freeing a gpio
When freeing a gpio that has not been exported, gpio_unexport() prints a debug message when it should just fall through silently. Example spurious message: gpio_unexport: gpio0 status -22 Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk> Cc: David Brownell <david-b@pacbell.net> Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> Cc: Gregory Bean <gbean@codeaurora.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/gpio/gpiolib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3ca3654..4e51fe3 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -893,10 +893,12 @@ EXPORT_SYMBOL_GPL(gpio_sysfs_set_active_low);
void gpio_unexport(unsigned gpio)
{
struct gpio_desc *desc;
- int status = -EINVAL;
+ int status = 0;
- if (!gpio_is_valid(gpio))
+ if (!gpio_is_valid(gpio)) {
+ status = -EINVAL;
goto done;
+ }
mutex_lock(&sysfs_lock);
@@ -911,7 +913,6 @@ void gpio_unexport(unsigned gpio)
clear_bit(FLAG_EXPORT, &desc->flags);
put_device(dev);
device_unregister(dev);
- status = 0;
} else
status = -ENODEV;
}
OpenPOWER on IntegriCloud