From 6a6023aacfad597637e266e9a96aae9df6d26b8f Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Wed, 8 Dec 2010 11:07:54 +0530
Subject: [PATCH] --- yaml --- r: 226012 b: refs/heads/master c:
 8d568ae5362c00c5b0b8e61bceb1829c8051002e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/plat-nomadik/gpio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15cb41a341bf..513a439ef15a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec4a637d35d4e05d1f43a68d647fb2453891379a
+refs/heads/master: 8d568ae5362c00c5b0b8e61bceb1829c8051002e
diff --git a/trunk/arch/arm/plat-nomadik/gpio.c b/trunk/arch/arm/plat-nomadik/gpio.c
index 5fc8e4d8cd2a..eda4e3a11a3d 100644
--- a/trunk/arch/arm/plat-nomadik/gpio.c
+++ b/trunk/arch/arm/plat-nomadik/gpio.c
@@ -672,7 +672,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 
 	chip = &nmk_chip->chip;
 	chip->base = pdata->first_gpio;
-	chip->label = pdata->name;
+	chip->label = pdata->name ?: dev_name(&dev->dev);
 	chip->dev = &dev->dev;
 	chip->owner = THIS_MODULE;