lkml.org 
[lkml]   [2011]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 3/3] ACPI / Battery: propagate sysfs error in acpi_battery_add()
    applied, after merging with acpi-test.

    merged version appended below.

    thanks,
    Len Brown, Intel Open Source Technology Center

    From eb03cb02b74df6dd0b653d5f6d976f16a434dfaf Mon Sep 17 00:00:00 2001
    From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    Date: Tue, 12 Jul 2011 09:03:29 +0100
    Subject: [PATCH] ACPI / Battery: propagate sysfs error in acpi_battery_add()
    X-Patchwork-Hint: ignore

    Make sure the error return from sysfs_add_battery() is checked and
    propagated out from acpi_battery_add().

    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    drivers/acpi/battery.c | 11 ++++++++---
    1 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
    index c771768..ffce2f0 100644
    --- a/drivers/acpi/battery.c
    +++ b/drivers/acpi/battery.c
    @@ -630,8 +630,11 @@ static int acpi_battery_update(struct acpi_battery *battery)
    return result;
    acpi_battery_init_alarm(battery);
    }
    - if (!battery->bat.dev)
    - sysfs_add_battery(battery);
    + if (!battery->bat.dev) {
    + result = sysfs_add_battery(battery);
    + if (result)
    + return result;
    + }
    result = acpi_battery_get_state(battery);
    acpi_battery_quirks(battery);
    return result;
    @@ -982,7 +985,9 @@ static int acpi_battery_add(struct acpi_device *device)
    if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle,
    "_BIX", &handle)))
    set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
    - acpi_battery_update(battery);
    + result = acpi_battery_update(battery);
    + if (result)
    + goto fail;
    #ifdef CONFIG_ACPI_PROCFS_POWER
    result = acpi_battery_add_fs(device);
    #endif
    --
    1.7.6.178.g55272


    \
     
     \ /
      Last update: 2011-07-17 01:01    [W:0.027 / U:92.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site