gpio: No NULL owner

Sometimes a GPIO is fetched with NULL as parent device, and
that is just fine. So under these circumstances, avoid using
dev_name() to provide a name for the GPIO line.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index bf083bc58d30..4092b8601c4e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3623,6 +3623,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
         struct gpio_desc *desc = NULL;
         int status;
         enum gpio_lookup_flags lookupflags = 0;
+        /* Maybe we have a device name, maybe not */
+        const char *devname = dev ? dev_name(dev) : "?";
 
         dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);
 
@@ -3651,8 +3653,11 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
                 return desc;
         }
 
-        /* If a connection label was passed use that, else use the device name as label */
-        status = gpiod_request(desc, con_id ? con_id : dev_name(dev));
+        /*
+         * If a connection label was passed use that, else attempt to use
+         * the device name as label
+         */
+        status = gpiod_request(desc, con_id ? con_id : devname);
         if (status < 0)
                 return ERR_PTR(status);