* [PATCH] ACPI: Battery: remove cycle from battery removal.
2007-11-02 14:20 [2.6.24-rc1][BUG] Oops on " Rolf Eike Beer
@ 2007-11-02 15:32 ` Alexey Starikovskiy
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Starikovskiy @ 2007-11-02 15:32 UTC (permalink / raw)
To: LenBrown; +Cc: Linux-acpi
get_property() should not call battery_update() on absent battery to
avoid cycle and oops.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
drivers/acpi/battery.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c2ce0ad..ca37db4 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -140,10 +140,11 @@ static int acpi_battery_get_property(struct power_supply *psy,
{
struct acpi_battery *battery = to_acpi_battery(psy);
- if ((!acpi_battery_present(battery)) &&
- psp != POWER_SUPPLY_PROP_PRESENT)
+ if (acpi_battery_present(battery)) {
+ /* run battery update only if it is present */
+ acpi_battery_update(battery);
+ } else if (psp != POWER_SUPPLY_PROP_PRESENT)
return -ENODEV;
- acpi_battery_update(battery);
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
if (battery->state & 0x01)
@@ -457,6 +458,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
return;
device_remove_file(battery->bat.dev, &alarm_attr);
power_supply_unregister(&battery->bat);
+ battery->bat.dev = NULL;
}
static int acpi_battery_update(struct acpi_battery *battery)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ACPI: Battery: remove cycle from battery removal.
2007-11-13 8:35 2.6.24-rc1: OOPS at acpi_battery_update Alexey Starikovskiy
@ 2007-11-13 9:23 ` Alexey Starikovskiy
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Starikovskiy @ 2007-11-13 9:23 UTC (permalink / raw)
To: torvalds; +Cc: Linux-acpi
get_property() should not call battery_update(),
it also should call get_status() only if battery is present to
avoid cycle and oops.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Acked-by: Johannes Weiner <hannes@saeurebad.de>
---
drivers/acpi/battery.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c2ce0ad..192c244 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -132,7 +132,7 @@ static int acpi_battery_technology(struct acpi_battery *battery)
return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
}
-static int acpi_battery_update(struct acpi_battery *battery);
+static int acpi_battery_get_state(struct acpi_battery *battery);
static int acpi_battery_get_property(struct power_supply *psy,
enum power_supply_property psp,
@@ -140,10 +140,11 @@ static int acpi_battery_get_property(struct power_supply *psy,
{
struct acpi_battery *battery = to_acpi_battery(psy);
- if ((!acpi_battery_present(battery)) &&
- psp != POWER_SUPPLY_PROP_PRESENT)
+ if (acpi_battery_present(battery)) {
+ /* run battery update only if it is present */
+ acpi_battery_get_state(battery);
+ } else if (psp != POWER_SUPPLY_PROP_PRESENT)
return -ENODEV;
- acpi_battery_update(battery);
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
if (battery->state & 0x01)
@@ -457,6 +458,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
return;
device_remove_file(battery->bat.dev, &alarm_attr);
power_supply_unregister(&battery->bat);
+ battery->bat.dev = NULL;
}
static int acpi_battery_update(struct acpi_battery *battery)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ACPI: Battery: remove cycle from battery removal.
@ 2007-11-14 17:54 Alexey Starikovskiy
2007-11-14 21:21 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Starikovskiy @ 2007-11-14 17:54 UTC (permalink / raw)
To: LenBrown; +Cc: Linux-acpi
get_property() should not call battery_update(),
it also should call get_status() only if battery is present to
avoid cycle and oops.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Acked-by: Johannes Weiner <hannes@saeurebad.de>
---
drivers/acpi/battery.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c2ce0ad..192c244 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -132,7 +132,7 @@ static int acpi_battery_technology(struct acpi_battery *battery)
return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
}
-static int acpi_battery_update(struct acpi_battery *battery);
+static int acpi_battery_get_state(struct acpi_battery *battery);
static int acpi_battery_get_property(struct power_supply *psy,
enum power_supply_property psp,
@@ -140,10 +140,11 @@ static int acpi_battery_get_property(struct power_supply *psy,
{
struct acpi_battery *battery = to_acpi_battery(psy);
- if ((!acpi_battery_present(battery)) &&
- psp != POWER_SUPPLY_PROP_PRESENT)
+ if (acpi_battery_present(battery)) {
+ /* run battery update only if it is present */
+ acpi_battery_get_state(battery);
+ } else if (psp != POWER_SUPPLY_PROP_PRESENT)
return -ENODEV;
- acpi_battery_update(battery);
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
if (battery->state & 0x01)
@@ -457,6 +458,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
return;
device_remove_file(battery->bat.dev, &alarm_attr);
power_supply_unregister(&battery->bat);
+ battery->bat.dev = NULL;
}
static int acpi_battery_update(struct acpi_battery *battery)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI: Battery: remove cycle from battery removal.
2007-11-14 21:21 ` Rafael J. Wysocki
@ 2007-11-14 21:06 ` Alexey Starikovskiy
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Starikovskiy @ 2007-11-14 21:06 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: LenBrown, Linux-acpi
Rafael J. Wysocki wrote:
> On Wednesday, 14 of November 2007, Alexey Starikovskiy wrote:
>> get_property() should not call battery_update(),
>> it also should call get_status() only if battery is present to
>> avoid cycle and oops.
>>
>> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
>> Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
>> Acked-by: Johannes Weiner <hannes@saeurebad.de>
>
> It looks like this patch has been merged as commit
> 9104476e4efbef8a8e32d48ced583603ff32a2db
Yes, I noticed.
Thanks,
Alex.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI: Battery: remove cycle from battery removal.
2007-11-14 17:54 [PATCH] ACPI: Battery: remove cycle from battery removal Alexey Starikovskiy
@ 2007-11-14 21:21 ` Rafael J. Wysocki
2007-11-14 21:06 ` Alexey Starikovskiy
0 siblings, 1 reply; 5+ messages in thread
From: Rafael J. Wysocki @ 2007-11-14 21:21 UTC (permalink / raw)
To: Alexey Starikovskiy; +Cc: LenBrown, Linux-acpi
On Wednesday, 14 of November 2007, Alexey Starikovskiy wrote:
> get_property() should not call battery_update(),
> it also should call get_status() only if battery is present to
> avoid cycle and oops.
>
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
> Acked-by: Johannes Weiner <hannes@saeurebad.de>
It looks like this patch has been merged as commit
9104476e4efbef8a8e32d48ced583603ff32a2db
> ---
>
> drivers/acpi/battery.c | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index c2ce0ad..192c244 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -132,7 +132,7 @@ static int acpi_battery_technology(struct acpi_battery *battery)
> return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
> }
>
> -static int acpi_battery_update(struct acpi_battery *battery);
> +static int acpi_battery_get_state(struct acpi_battery *battery);
>
> static int acpi_battery_get_property(struct power_supply *psy,
> enum power_supply_property psp,
> @@ -140,10 +140,11 @@ static int acpi_battery_get_property(struct power_supply *psy,
> {
> struct acpi_battery *battery = to_acpi_battery(psy);
>
> - if ((!acpi_battery_present(battery)) &&
> - psp != POWER_SUPPLY_PROP_PRESENT)
> + if (acpi_battery_present(battery)) {
> + /* run battery update only if it is present */
> + acpi_battery_get_state(battery);
> + } else if (psp != POWER_SUPPLY_PROP_PRESENT)
> return -ENODEV;
> - acpi_battery_update(battery);
> switch (psp) {
> case POWER_SUPPLY_PROP_STATUS:
> if (battery->state & 0x01)
> @@ -457,6 +458,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
> return;
> device_remove_file(battery->bat.dev, &alarm_attr);
> power_supply_unregister(&battery->bat);
> + battery->bat.dev = NULL;
> }
>
> static int acpi_battery_update(struct acpi_battery *battery)
>
> -
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-11-14 21:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-14 17:54 [PATCH] ACPI: Battery: remove cycle from battery removal Alexey Starikovskiy
2007-11-14 21:21 ` Rafael J. Wysocki
2007-11-14 21:06 ` Alexey Starikovskiy
-- strict thread matches above, loose matches on Subject: below --
2007-11-13 8:35 2.6.24-rc1: OOPS at acpi_battery_update Alexey Starikovskiy
2007-11-13 9:23 ` [PATCH] ACPI: Battery: remove cycle from battery removal Alexey Starikovskiy
2007-11-02 14:20 [2.6.24-rc1][BUG] Oops on " Rolf Eike Beer
2007-11-02 15:32 ` [PATCH] ACPI: Battery: remove cycle from " Alexey Starikovskiy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox