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>

drivers/power/supply/cpcap-battery.c

@@ -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 */