Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185689
b: refs/heads/master
c: afbc74f
h: refs/heads/master
i:
  185687: 81c6234
v: v3
  • Loading branch information
Grazvydas Ignotas authored and Anton Vorontsov committed Feb 27, 2010
1 parent 2f28392 commit b6a8bee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e924a814ac78e325653840190e9e4762e6f4b7c
refs/heads/master: afbc74fdc5b96552c384e57119b3cc13c840bf06
6 changes: 3 additions & 3 deletions trunk/drivers/power/bq27x00_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
return ret;
}

return volt;
return volt * 1000;
}

/*
Expand Down Expand Up @@ -156,11 +156,11 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di)
}
if (flags & BQ27000_FLAG_CHGS) {
dev_dbg(di->dev, "negative current!\n");
return -curr;
curr = -curr;
}
}

return curr;
return curr * 1000;
}

/*
Expand Down

0 comments on commit b6a8bee

Please sign in to comment.