mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Merge branch 'psy-fixes' into psy-next
Merge fixes branch into next branch for cpcap-battery patches. Signed-off-by: Sebastian Reichel <sre@collabora.com>
This commit is contained in:
commit
6f76aa94e1
1 changed files with 3 additions and 0 deletions
|
@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata,
|
|||
int avg_current;
|
||||
u32 cc_lsb;
|
||||
|
||||
if (!divider)
|
||||
return 0;
|
||||
|
||||
sample &= 0xffffff; /* 24-bits, unsigned */
|
||||
offset &= 0x7ff; /* 10-bits, signed */
|
||||
|
||||
|
|
Loading…
Reference in a new issue