Merge tag 'for-v5.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
"Two more fixes for the 5.1 cycle.

One division by zero fix in a specific driver and one core workaround
for bad userspace behaviour from systemd regarding uevents. IMHO this
can be considered to be a userspace bug, but the debug messages are
useless anyways

- cpcap-battery: fix a division by zero

- core: fix systemd issue due to log messages produced by uevent"

* tag 'for-v5.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG
power: supply: cpcap-battery: Fix division by zero

+3 -6
+3
drivers/power/supply/cpcap-battery.c
··· 221 221 int avg_current; 222 222 u32 cc_lsb; 223 223 224 + if (!divider) 225 + return 0; 226 + 224 227 sample &= 0xffffff; /* 24-bits, unsigned */ 225 228 offset &= 0x7ff; /* 10-bits, signed */ 226 229
-6
drivers/power/supply/power_supply_sysfs.c
··· 383 383 char *prop_buf; 384 384 char *attrname; 385 385 386 - dev_dbg(dev, "uevent\n"); 387 - 388 386 if (!psy || !psy->desc) { 389 387 dev_dbg(dev, "No power supply yet\n"); 390 388 return ret; 391 389 } 392 - 393 - dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name); 394 390 395 391 ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name); 396 392 if (ret) ··· 422 426 ret = -ENOMEM; 423 427 goto out; 424 428 } 425 - 426 - dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf); 427 429 428 430 ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf); 429 431 kfree(attrname);