diff options
| author |   Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 19:42:43 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 20:53:15 +0200 |
| commit | d4e2385c691101d0bf412f7c5fecfc279eb919c7 (patch) | |
| tree | 6ea4384bb663d7114c3a17f5b11e61442bdd43fa /drivers/power/supply/sbs-battery.c | |
| parent | power: supply: Add support for MAX1721x standalone fuel gauge (diff) | |
| parent | power: supply: act8945a_charger: fix of_irq_get() error check (diff) | |
| download | linux-dev-d4e2385c691101d0bf412f7c5fecfc279eb919c7.tar.xz linux-dev-d4e2385c691101d0bf412f7c5fecfc279eb919c7.zip | |
Merge branch 'fixes' into for-next
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply/sbs-battery.c')
| -rw-r--r-- | drivers/power/supply/sbs-battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index f7059459f0fb..e8065af085bd 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -60,8 +60,8 @@ enum { #define BATTERY_MODE_OFFSET 0x03 #define BATTERY_MODE_MASK 0x8000 enum sbs_battery_mode { - BATTERY_MODE_AMPS, - BATTERY_MODE_WATTS + BATTERY_MODE_AMPS = 0, + BATTERY_MODE_WATTS = 0x8000 }; /* manufacturer access defines */ |