From patchwork Thu Dec 13 15:21:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13542 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E83B623E2A for ; Thu, 13 Dec 2012 15:22:06 +0000 (UTC) Received: from mail-ia0-f171.google.com (mail-ia0-f171.google.com [209.85.210.171]) by fiordland.canonical.com (Postfix) with ESMTP id 83B4AA18A3A for ; Thu, 13 Dec 2012 15:22:06 +0000 (UTC) Received: by mail-ia0-f171.google.com with SMTP id k27so2082294iad.2 for ; Thu, 13 Dec 2012 07:22:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=lB5sTFXnFw4wo4NB1dgXgpkz++w2cSwJ+MkqDIF7dFg=; b=WJKq8fEgAj7KL00uImWncxko4rAHI8nH/x37Ppw9i5mVJxiWmB5BEdsTNJBQvoJswR 2/JBTmrjiLpUrXmlAXQ8lZTv+E7zOA9cEsl5OkYpetW+tBTaFjiAoEaaCCGR+WpD8mD2 6SjfEfjfOm4trieqDoyIMfteYkK9TjgE9a90XN0/kECBKijBvcU8oAtnQ1JSn9jNjQiI neL5qeTHilvZMD7VPwDAQoVdN5eX8BbomWAx2XT7EVTJrA8sMy9VbvVQ+YJAI3qgN3uQ 6PyEGsoM82JoxO3drLpWGThItOYoUcOOEg7l4RYTDKPuL0Z6CKX3w7nlW5cQLaIsDWHj MkjA== Received: by 10.50.161.169 with SMTP id xt9mr16903290igb.62.1355412125986; Thu, 13 Dec 2012 07:22:05 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp16256igt; Thu, 13 Dec 2012 07:22:05 -0800 (PST) Received: by 10.194.85.234 with SMTP id k10mr9029922wjz.53.1355412124996; Thu, 13 Dec 2012 07:22:04 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id em13si5932655wid.31.2012.12.13.07.22.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:22:04 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id x43so1014211wey.37 for ; Thu, 13 Dec 2012 07:22:04 -0800 (PST) Received: by 10.180.101.99 with SMTP id ff3mr1927417wib.21.1355412124391; Thu, 13 Dec 2012 07:22:04 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id i6sm8200894wix.5.2012.12.13.07.22.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:22:03 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: cbou@mail.ru, Jonas Aaberg , Lee Jones Subject: [PATCH 06/18] power: ab8500_charger: Handle gpadc errors Date: Thu, 13 Dec 2012 15:21:29 +0000 Message-Id: <1355412102-14265-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> References: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlzu2SvQZHSjzIN/ZfWJEyhkS3E0w3XVRKFFQHNMMd+WSmT/HXfNdbSe01vZsNYnpHb7xZl From: Jonas Aaberg Gracefully handle gpadc conversion errors. Signed-off-by: Lee Jones Signed-off-by: Jonas Aaberg Reviewed-by: Johan BJORNSTEDT --- drivers/power/ab8500_charger.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index 8c09444..6a78e31 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -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 { @@ -2361,6 +2362,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)); @@ -2382,7 +2384,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: @@ -2394,7 +2399,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; @@ -2421,6 +2429,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)); @@ -2444,7 +2453,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: @@ -2456,7 +2467,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: /*