diff options
| author | Martin Kaiser <lists@kaiser.cx> | 2015-01-30 15:01:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-05 22:35:40 -0800 |
| commit | 60e353b14ad68daaef8685cc324fa45501615bee (patch) | |
| tree | e4456a728f2dbdf59e90fb929ccb4ac9b35a7ffc | |
| parent | 45006972b8570cbb7c083169f0f50afb05b9011d (diff) | |
gpio: squelch a compiler warning
drivers/gpio/gpiolib-of.c: In function 'of_gpiochip_find_and_xlate':
drivers/gpio/gpiolib-of.c:51:21: warning: assignment makes integer from
pointer without a cast [enabled by default]
gg_data->out_gpio = ERR_PTR(ret);
^
this was introduced in d1c3449160df60fac4abb56f0ba0a3784305e43e
the upstream kernel changed the type of out_gpio from int to struct gpio_desc *
as part of a larger refactoring that wasn't backported
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpio/gpiolib-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index af909a20dd70..74769724c94a 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; } |