diff options
| author | Lars-Peter Clausen | 2010-11-18 23:08:39 +0100 |
|---|---|---|
| committer | Anton Vorontsov | 2010-12-22 00:29:04 +0100 |
| commit | 80577b8a478f3386d106464f2a2241b2d43571ce (patch) | |
| tree | 039c6e70db32e426a2c122d89b07623924e5f395 /drivers/power | |
| parent | gpio-charger: Check result of kzalloc (diff) | |
| download | kernel-qcow2-linux-80577b8a478f3386d106464f2a2241b2d43571ce.tar.gz kernel-qcow2-linux-80577b8a478f3386d106464f2a2241b2d43571ce.tar.xz kernel-qcow2-linux-80577b8a478f3386d106464f2a2241b2d43571ce.zip | |
gpio-charger: Provide default name for the power_supply
This patch sets a default name for the power_supply in case there was
no name supplied through the platform_data.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/gpio-charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index 8458cafcd2b2..43078e34428a 100644 --- a/drivers/power/gpio-charger.c +++ b/drivers/power/gpio-charger.c @@ -94,7 +94,7 @@ static int __devinit gpio_charger_probe(struct platform_device *pdev) charger = &gpio_charger->charger; - charger->name = pdata->name; + charger->name = pdata->name ? pdata->name : "gpio-charger"; charger->type = pdata->type; charger->properties = gpio_charger_properties; charger->num_properties = ARRAY_SIZE(gpio_charger_properties); |