From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Len Brown <len.brown@intel.com>
Subject: [PATCH 2/3] Revert "ACPI battery: update status upon sysfs query"
Date: Sun, 26 Dec 2010 17:39:02 -0500 [thread overview]
Message-ID: <cde44d1740bcb3dcfecbf792a71826431e61686e.1293403093.git.len.brown@intel.com> (raw)
In-Reply-To: <1293403143-11922-1-git-send-email-lenb@kernel.org>
In-Reply-To: <b581a7f9c3abc6c7afacd021747543d32ff17adb.1293403093.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
This reverts commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.
as it caused a crash upon battery removal:
https://bugzilla.kernel.org/show_bug.cgi?id=25302
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/battery.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9fb9d5a..95649d3 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -130,8 +130,6 @@ struct acpi_battery {
unsigned long flags;
};
-static int acpi_battery_update(struct acpi_battery *battery);
-
#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
inline int acpi_battery_present(struct acpi_battery *battery)
@@ -186,9 +184,6 @@ static int acpi_battery_get_property(struct power_supply *psy,
int ret = 0;
struct acpi_battery *battery = to_acpi_battery(psy);
- if (acpi_battery_update(battery))
- return -ENODEV;
-
if (acpi_battery_present(battery)) {
/* run battery update only if it is present */
acpi_battery_get_state(battery);
--
1.7.3.3.557.gb5c17
next prev parent reply other threads:[~2010-12-26 22:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-26 22:39 ACPI patches for 2.6.37-rc-7 Len Brown
2010-12-26 22:39 ` [PATCH 1/3] ACPI: Execute _PRW for devices reported as inactive or not present Len Brown
2010-12-26 22:39 ` Len Brown [this message]
2010-12-26 22:39 ` [PATCH 3/3] ACPI / ACPICA: Disable GPEs during initialization Len Brown
2010-12-27 20:16 ` Rafael J. Wysocki
2010-12-28 0:50 ` Lin Ming
2010-12-28 9:49 ` Rafael J. Wysocki
2011-01-07 20:41 ` Moore, Robert
2011-01-07 21:14 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cde44d1740bcb3dcfecbf792a71826431e61686e.1293403093.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox