aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 16:26:12 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 15:52:33 +0200
commit01a28e78b62e161ed72d0830aa89ecb2be680074 (patch)
tree2fb6c6d1b795dfad0a7e7c482cd08c44ec82bf53 /drivers/gpio
parent516480c70a5392533c2e3a81863ac02206a66e1b (diff)
3.10.67 -> 3.10.68
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpiolib-of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index af909a20d..74769724c 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -48,7 +48,7 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data)
* Return true to stop looking and return the translation
* error via out_gpio
*/
- gg_data->out_gpio = ERR_PTR(ret);
+ gg_data->out_gpio = ret;
return true;
}