diff options
-rw-r--r-- | arch/arm/plat-nomadik/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c index 5fc8e4d8cd2a..eda4e3a11a3d 100644 --- a/arch/arm/plat-nomadik/gpio.c +++ b/arch/arm/plat-nomadik/gpio.c | |||
@@ -672,7 +672,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) | |||
672 | 672 | ||
673 | chip = &nmk_chip->chip; | 673 | chip = &nmk_chip->chip; |
674 | chip->base = pdata->first_gpio; | 674 | chip->base = pdata->first_gpio; |
675 | chip->label = pdata->name; | 675 | chip->label = pdata->name ?: dev_name(&dev->dev); |
676 | chip->dev = &dev->dev; | 676 | chip->dev = &dev->dev; |
677 | chip->owner = THIS_MODULE; | 677 | chip->owner = THIS_MODULE; |
678 | 678 | ||