From 461f91e35ba4c3c840a61de49f3ef9e4834a1822 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Fri, 11 Mar 2011 15:09:32 +0200 Subject: [PATCH] --- yaml --- r: 242596 b: refs/heads/master c: a223246f7280422f77c15b71455fe3362d3604b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/z2_battery.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2ff5dcc69572..ea1a15921a5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8d878ddbb3c08bc2f876975df674484208536ac +refs/heads/master: a223246f7280422f77c15b71455fe3362d3604b4 diff --git a/trunk/drivers/power/z2_battery.c b/trunk/drivers/power/z2_battery.c index 81304c0bb9d3..2a9ab89f83b8 100644 --- a/trunk/drivers/power/z2_battery.c +++ b/trunk/drivers/power/z2_battery.c @@ -134,6 +134,8 @@ static int z2_batt_ps_init(struct z2_charger *charger, int props) enum power_supply_property *prop; struct z2_battery_info *info = charger->info; + if (info->charge_gpio >= 0) + props++; /* POWER_SUPPLY_PROP_STATUS */ if (info->batt_tech >= 0) props++; /* POWER_SUPPLY_PROP_TECHNOLOGY */ if (info->batt_I2C_reg >= 0)