Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 600d7258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 65beea4c 349ced99

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

drivers/power/supply/power_supply_sysfs.c

+0 −6
Original line number Diff line number Diff line
@@ -383,15 +383,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) 
	char *prop_buf;

	char *attrname;



	dev_dbg(dev, "uevent\n");



	if (!psy || !psy->desc) {

		dev_dbg(dev, "No power supply yet\n");

		return ret;

	}



	dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name);



	ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name);

	if (ret)

		return ret;
@@ -427,8 +423,6 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) 
			goto out;

		}



		dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf);



		ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf);

		kfree(attrname);

		if (ret)