]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix build error in queue-3.10/gpiolib-of-correct-error-handling-in-of_get_named_gpiod...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 22:03:54 +0000 (14:03 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 22:03:54 +0000 (14:03 -0800)
queue-3.10/gpiolib-of-correct-error-handling-in-of_get_named_gpiod_flags.patch

index bf2e482711cce5324fb41f0129a44f3f30a3b6a8..8cf38b265f25b32b296c8b885779340c2c07d7dc 100644 (file)
@@ -19,12 +19,20 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/gpio/gpiolib-of.c |   1++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ drivers/gpio/gpiolib-of.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
 
 --- a/drivers/gpio/gpiolib-of.c
 +++ b/drivers/gpio/gpiolib-of.c
-@@ -42,8 +42,14 @@ static int of_gpiochip_find_and_xlate(st
+@@ -12,6 +12,7 @@
+  */
+ #include <linux/device.h>
++#include <linux/err.h>
+ #include <linux/errno.h>
+ #include <linux/module.h>
+ #include <linux/io.h>
+@@ -42,8 +43,14 @@ static int of_gpiochip_find_and_xlate(st
                return false;
  
        ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags);