Commit 6f76aa94 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge branch 'psy-fixes' into psy-next 



Merge fixes branch into next branch for cpcap-battery
patches.

Signed-off-by: default avatarSebastian Reichel <sre@collabora.com>
parents df68c44c dbe7208c

drivers/power/supply/cpcap-battery.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */