From patchwork Sat May 7 02:59:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Pandruvada X-Patchwork-Id: 9037381 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A3C79F372 for ; Sat, 7 May 2016 03:00:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75CD3203B4 for ; Sat, 7 May 2016 03:00:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EA56203B0 for ; Sat, 7 May 2016 03:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758954AbcEGDA1 (ORCPT ); Fri, 6 May 2016 23:00:27 -0400 Received: from mga11.intel.com ([192.55.52.93]:36831 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759014AbcEGDAZ (ORCPT ); Fri, 6 May 2016 23:00:25 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 06 May 2016 20:00:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,589,1455004800"; d="scan'208";a="698138150" Received: from rrmarti3-mobl2.amr.corp.intel.com (HELO spandruv-mobl3.jf.intel.com) ([10.254.176.166]) by FMSMGA003.fm.intel.com with ESMTP; 06 May 2016 20:00:19 -0700 From: Srinivas Pandruvada To: rjw@rjwysocki.net Cc: linux-acpi@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH 3/3] acpi: battery_common: battery present status for INT3407 Date: Fri, 6 May 2016 19:59:44 -0700 Message-Id: <1462589984-27253-4-git-send-email-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1462589984-27253-1-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1462589984-27253-1-git-send-email-srinivas.pandruvada@linux.intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP acpi_battery_get_status() will be called often to check if the battery is present. This call sets status.battery_present field to return the status. But When enumerated via DPTF power (INT3407), since this field will not be set as this is not a battery but it will still set the status.present field. So a check is added when hid is INT3407 check for the presence and set the status.battery_present flag, so that the rest of the driver calls don't fail looking for status.battery_present flag. Signed-off-by: Srinivas Pandruvada --- drivers/acpi/battery_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/acpi/battery_common.c b/drivers/acpi/battery_common.c index 868621a..ea783f9 100644 --- a/drivers/acpi/battery_common.c +++ b/drivers/acpi/battery_common.c @@ -426,6 +426,11 @@ static int acpi_battery_get_status(struct acpi_battery *battery) return -ENODEV; } + if (!strcmp(acpi_device_hid(battery->device), "INT3407")) { + if (battery->device->status.present) + battery->device->status.battery_present = 1; + } + return 0; }