diff options
| author | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
| commit | 3a83621f0e6a52eff7402702b0774092cc7b0187 (patch) | |
| tree | 0962d7359b5b15176a87d03b80be7ba70e252313 /drivers/power/gta01_battery.c | |
| parent | 6e278419626d23b3c15e4cb0ee3b56ce4ab99f87 (diff) | |
| parent | 23b564c9d22cc5e442361e632626d5f131c40752 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/power/gta01_battery.c')
| -rw-r--r-- | drivers/power/gta01_battery.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/gta01_battery.c b/drivers/power/gta01_battery.c index 909f7fe16d9..81a0fe7387e 100644 --- a/drivers/power/gta01_battery.c +++ b/drivers/power/gta01_battery.c @@ -19,6 +19,7 @@ struct gta01_battery { }; static enum power_supply_property gta01_bat_props[] = { + POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_CURRENT_NOW, @@ -43,6 +44,9 @@ static int gta01_bat_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CURRENT_NOW: val->intval = bat->pdata->get_current(); break; + case POWER_SUPPLY_PROP_PRESENT: + val->intval = 1; /* You must never run GTA01 without battery. */ + break; default: return -EINVAL; } |