From 0f45e147eabf09384c8794f52068c51751c20c24 Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Thu, 30 Jun 2011 11:34:12 +0800 Subject: [PATCH] --- yaml --- r: 262276 b: refs/heads/master c: 9c921c22a7f33397a6774d7fa076db9b6a0fd669 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/battery.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b3c9359e04d..b2011fb066f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e17fb6aa1a67afa1827ae317c3594040f055730 +refs/heads/master: 9c921c22a7f33397a6774d7fa076db9b6a0fd669 diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c index 4ba339d0ea19..40bf01d42cc3 100644 --- a/trunk/drivers/acpi/battery.c +++ b/trunk/drivers/acpi/battery.c @@ -573,11 +573,16 @@ static int sysfs_add_battery(struct acpi_battery *battery) static void sysfs_remove_battery(struct acpi_battery *battery) { - if (!battery->bat.dev) + mutex_lock(&battery->lock); + if (!battery->bat.dev) { + mutex_unlock(&battery->lock); return; + } + device_remove_file(battery->bat.dev, &alarm_attr); power_supply_unregister(&battery->bat); battery->bat.dev = NULL; + mutex_unlock(&battery->lock); } /*