Commit a864c5a8 authored by Jonas Aaberg's avatar Jonas Aaberg Committed by Anton Vorontsov
Browse files

ab8500_charger: Handle gpadc errors 



Gracefully handle gpadc conversion errors.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-by: default avatarJohan BJORNSTEDT <johan.bjornstedt@stericsson.com>
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent 9a0bd070

drivers/power/ab8500_charger.c

+18 −4
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct ab8500_charger_info { 
	int charger_voltage;

	int cv_active;

	bool wd_expired;

	int charger_current;

};



struct ab8500_charger_event_flags {
@@ -2358,6 +2359,7 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy, 
	union power_supply_propval *val)

{

	struct ab8500_charger *di;

	int ret;



	di = to_ab8500_charger_ac_device_info(psy_to_ux500_charger(psy));
@@ -2379,7 +2381,10 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy, 
		val->intval = di->ac.charger_connected;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		di->ac.charger_voltage = ab8500_charger_get_ac_voltage(di);

		ret = ab8500_charger_get_ac_voltage(di);

		if (ret >= 0)

			di->ac.charger_voltage = ret;

		/* On error, use previous value */

		val->intval = di->ac.charger_voltage * 1000;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_AVG:
@@ -2391,7 +2396,10 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy, 
		val->intval = di->ac.cv_active;

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

		val->intval = ab8500_charger_get_ac_current(di) * 1000;

		ret = ab8500_charger_get_ac_current(di);

		if (ret >= 0)

			di->ac.charger_current = ret;

		val->intval = di->ac.charger_current * 1000;

		break;

	default:

		return -EINVAL;
@@ -2418,6 +2426,7 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy, 
	union power_supply_propval *val)

{

	struct ab8500_charger *di;

	int ret;



	di = to_ab8500_charger_usb_device_info(psy_to_ux500_charger(psy));
@@ -2441,7 +2450,9 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy, 
		val->intval = di->usb.charger_connected;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		di->usb.charger_voltage = ab8500_charger_get_vbus_voltage(di);

		ret = ab8500_charger_get_vbus_voltage(di);

		if (ret >= 0)

			di->usb.charger_voltage = ret;

		val->intval = di->usb.charger_voltage * 1000;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_AVG:
@@ -2453,7 +2464,10 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy, 
		val->intval = di->usb.cv_active;

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

		val->intval = ab8500_charger_get_usb_current(di) * 1000;

		ret = ab8500_charger_get_usb_current(di);

		if (ret >= 0)

			di->usb.charger_current = ret;

		val->intval = di->usb.charger_current * 1000;

		break;

	case POWER_SUPPLY_PROP_CURRENT_AVG:

		/*