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

Commit de109c98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/cbou/battery-2.6.36 

* git://git.infradead.org/users/cbou/battery-2.6.36:
  apm_power: Add missing break statement
  intel_pmic_battery: Fix battery charging status on mrst
parents 7fd3fce3 1d220334

drivers/power/apm_power.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static int calculate_capacity(enum apm_source source) 
		empty_design_prop = POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN;

		now_prop = POWER_SUPPLY_PROP_ENERGY_NOW;

		avg_prop = POWER_SUPPLY_PROP_ENERGY_AVG;

		break;

	case SOURCE_VOLTAGE:

		full_prop = POWER_SUPPLY_PROP_VOLTAGE_MAX;

		empty_prop = POWER_SUPPLY_PROP_VOLTAGE_MIN;

drivers/power/intel_mid_battery.c

+3 −3
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ static int pmic_scu_ipc_battery_property_get(struct battery_property *prop) 
{

	u32 data[3];

	u8 *p = (u8 *)&data[1];

	int err = intel_scu_ipc_command(IPC_CMD_BATTERY_PROPERTY,

				IPCMSG_BATTERY, NULL, 0, data, 3);

	int err = intel_scu_ipc_command(IPCMSG_BATTERY,

				IPC_CMD_BATTERY_PROPERTY, NULL, 0, data, 3);



	prop->capacity = data[0];

	prop->crnt = *p++;
@@ -207,7 +207,7 @@ static int pmic_scu_ipc_battery_property_get(struct battery_property *prop) 


static int pmic_scu_ipc_set_charger(int charger)

{

	return intel_scu_ipc_simple_command(charger, IPCMSG_BATTERY);

	return intel_scu_ipc_simple_command(IPCMSG_BATTERY, charger);

}



/**