Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpiolib-of.c

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index e0a98f581f58d5fd7266a4d805286d7df14e4452..2024d45e5503624ba7c1b9ff7d75f91fb4e912e1 100644 (file)
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/io.h>
@@ -90,7 +91,7 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,
 
        of_node_put(gg_data.gpiospec.np);
        pr_debug("%s exited with status %d\n", __func__,
-                PTR_RET(gg_data.out_gpio));
+                PTR_ERR_OR_ZERO(gg_data.out_gpio));
        return gg_data.out_gpio;
 }
 EXPORT_SYMBOL(of_get_named_gpiod_flags);