From f13aac11d71f693cdb1a5d19074b7d50f6cffa71 Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Thu, 30 Jun 2011 11:33:27 +0800 Subject: [PATCH] --- yaml --- r: 262273 b: refs/heads/master c: 7b78622d0f9df9f274a319eea1494240119d3734 h: refs/heads/master i: 262271: 38b4dff722e11446ddbc7859e5410e2be6364b31 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/battery.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fb5e931f3b4..404f7c202308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55003b2105a4578736f3e868fbaa889bb1ff3ce0 +refs/heads/master: 7b78622d0f9df9f274a319eea1494240119d3734 diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c index ff1ff70da384..ba7926fce4fb 100644 --- a/trunk/drivers/acpi/battery.c +++ b/trunk/drivers/acpi/battery.c @@ -592,7 +592,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery) * * Handle this correctly so that they won't break userspace. */ -static void acpi_battery_quirks2(struct acpi_battery *battery) +static void acpi_battery_quirks(struct acpi_battery *battery) { if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)) return ; @@ -628,7 +628,7 @@ static int acpi_battery_update(struct acpi_battery *battery) if (!battery->bat.dev) sysfs_add_battery(battery); result = acpi_battery_get_state(battery); - acpi_battery_quirks2(battery); + acpi_battery_quirks(battery); return result; }