diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-12-08 11:07:54 +0530 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@stericsson.com> | 2010-12-08 13:24:50 +0100 |
| commit | 8d568ae5362c00c5b0b8e61bceb1829c8051002e (patch) | |
| tree | 09220742cbf8507107e08205bd1142a36bccade9 /arch/arm/plat-nomadik | |
| parent | ec4a637d35d4e05d1f43a68d647fb2453891379a (diff) | |
| download | blackbird-op-linux-8d568ae5362c00c5b0b8e61bceb1829c8051002e.tar.gz blackbird-op-linux-8d568ae5362c00c5b0b8e61bceb1829c8051002e.zip | |
nomadik-gpio: use dev name if no name is specified
Platforms may choose not to provide an additional name for the GPIO
block.
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/plat-nomadik')
| -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) 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; |
