Merge tag 'armsoc-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-tb10x.c

diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c
index 80b6959ae995388a10e43fc48d418571d16db12d..091ffaaec635411e6665e78991ed2faef75b3b7c 100644 (file)
--- a/drivers/gpio/gpio-tb10x.c
+++ b/drivers/gpio/gpio-tb10x.c
@@ -191,7 +191,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
        if (IS_ERR(tb10x_gpio->base))
                return PTR_ERR(tb10x_gpio->base);
 
-       tb10x_gpio->gc.label            = of_node_full_name(dn);
+       tb10x_gpio->gc.label            =
+               devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node);
        tb10x_gpio->gc.parent           = &pdev->dev;
        tb10x_gpio->gc.owner            = THIS_MODULE;
        tb10x_gpio->gc.direction_input  = tb10x_gpio_direction_in;