diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2012-10-25 14:03:03 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-10-26 09:25:10 +0200 |
| commit | ad2fab36d7922401c4576fb7ea9b21a47a29a17f (patch) | |
| tree | 16b7246490039315f86bbd45e987a71367f94000 /drivers/gpio/gpiolib.c | |
| parent | c57d75c099e55500b620f50a207e61b9e20ecd29 (diff) | |
| download | linux-ad2fab36d7922401c4576fb7ea9b21a47a29a17f.tar.gz linux-ad2fab36d7922401c4576fb7ea9b21a47a29a17f.tar.bz2 linux-ad2fab36d7922401c4576fb7ea9b21a47a29a17f.zip | |
gpiolib: Don't return -EPROBE_DEFER to sysfs, or for invalid gpios
gpios requested with invalid numbers, or gpios requested from userspace via sysfs
should not try to be deferred on failure.
Cc: stable@kernel.org
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 5d6c71edc739..1c8d9e3380e1 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -623,9 +623,11 @@ static ssize_t export_store(struct class *class, */ status = gpio_request(gpio, "sysfs"); - if (status < 0) + if (status < 0) { + if (status == -EPROBE_DEFER) + status = -ENODEV; goto done; - + } status = gpio_export(gpio, true); if (status < 0) gpio_free(gpio); @@ -1191,8 +1193,10 @@ int gpio_request(unsigned gpio, const char *label) spin_lock_irqsave(&gpio_lock, flags); - if (!gpio_is_valid(gpio)) + if (!gpio_is_valid(gpio)) { + status = -EINVAL; goto done; + } desc = &gpio_desc[gpio]; chip = desc->chip; if (chip == NULL) |