lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[151/251] ACPI / battery: Fix parsing _BIX return value
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Lan Tianyu <tianyu.lan@intel.com>

    [ Upstream commit 016d5baad04269e8559332df05f89bd95b52d6ad ]

    The _BIX method returns extended battery info as a package.
    According the ACPI spec (ACPI 5, Section 10.2.2.2), the first member
    of that package should be "Revision". However, the current ACPI
    battery driver treats the first member as "Power Unit" which should
    be the second member. This causes the result of _BIX return data
    parsing to be incorrect.

    Fix this by adding a new member called 'revision' to struct
    acpi_battery and adding the offsetof() information on it to
    extended_info_offsets[] as the first row.

    [rjw: Changelog]
    Reported-and-tested-by: Jan Hoffmann <jan.christian.hoffmann@gmail.com>
    References: http://bugzilla.kernel.org/show_bug.cgi?id=60519
    Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
    Cc: 2.6.34+ <stable@vger.kernel.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/acpi/battery.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
    index 7efaeaa..7663df7 100644
    --- a/drivers/acpi/battery.c
    +++ b/drivers/acpi/battery.c
    @@ -117,6 +117,7 @@ struct acpi_battery {
    struct acpi_device *device;
    struct notifier_block pm_nb;
    unsigned long update_time;
    + int revision;
    int rate_now;
    int capacity_now;
    int voltage_now;
    @@ -359,6 +360,7 @@ static struct acpi_offsets info_offsets[] = {
    };

    static struct acpi_offsets extended_info_offsets[] = {
    + {offsetof(struct acpi_battery, revision), 0},
    {offsetof(struct acpi_battery, power_unit), 0},
    {offsetof(struct acpi_battery, design_capacity), 0},
    {offsetof(struct acpi_battery, full_charge_capacity), 0},
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-11 08:21    [W:5.109 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site