* [PATCH] Fix Thinkpad A21m shutdown
@ 2006-04-12 13:32 Thomas Renninger
2006-04-12 21:40 ` Borislav Deianov
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Renninger @ 2006-04-12 13:32 UTC (permalink / raw)
To: Brown, Len; +Cc: linux-acpi, borislav, linux-thinkpad, Raymund Will
Subject: Fix Thinkpad A21m shutdown
The A21m Thinkpad (maybe also others) have a GDCK method and a DOCK device.
It seems that on others machines the GDCK is the docking device.
Installing the notify handler for a GDCK device fails.
When module is unloaded it is tried to remove the never installed
notify handler for the GDCK method which seems to freeze the machine.
Fix: Do not set notify_installed when installing the notify handler fails.
Signed-off-by: Thomas Renninger <trenn@suse.de>
drivers/acpi/ibm_acpi.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Index: linux-2.6.16/drivers/acpi/ibm_acpi.c
===================================================================
--- linux-2.6.16.orig/drivers/acpi/ibm_acpi.c
+++ linux-2.6.16/drivers/acpi/ibm_acpi.c
@@ -1716,12 +1716,12 @@ static int __init setup_notify(struct ib
int ret;
if (!*ibm->handle)
- return 0;
+ return 1;
ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
if (ret < 0) {
printk(IBM_ERR "%s device not present\n", ibm->name);
- return 0;
+ return 1;
}
acpi_driver_data(ibm->device) = ibm;
@@ -1811,6 +1811,8 @@ static int __init ibm_init(struct ibm_st
ret = setup_notify(ibm);
if (ret < 0)
return ret;
+ if (ret > 0)
+ return 0;
ibm->notify_installed = 1;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix Thinkpad A21m shutdown
2006-04-12 13:32 [PATCH] Fix Thinkpad A21m shutdown Thomas Renninger
@ 2006-04-12 21:40 ` Borislav Deianov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Deianov @ 2006-04-12 21:40 UTC (permalink / raw)
To: Thomas Renninger, Brown, Len; +Cc: linux-acpi, linux-thinkpad, Raymund Will
On Wed, Apr 12, 2006 at 03:32:12PM +0200, Thomas Renninger wrote:
>
> The A21m Thinkpad (maybe also others) have a GDCK method and a DOCK device.
> It seems that on others machines the GDCK is the docking device.
> Installing the notify handler for a GDCK device fails.
> When module is unloaded it is tried to remove the never installed
> notify handler for the GDCK method which seems to freeze the machine.
>
> Fix: Do not set notify_installed when installing the notify handler fails.
Thanks, Thomas - makes sense. Len, please apply.
Regards,
Borislav
Signed-off-by: Thomas Renninger <trenn@suse.de>
drivers/acpi/ibm_acpi.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Index: linux-2.6.16/drivers/acpi/ibm_acpi.c
===================================================================
--- linux-2.6.16.orig/drivers/acpi/ibm_acpi.c
+++ linux-2.6.16/drivers/acpi/ibm_acpi.c
@@ -1716,12 +1716,12 @@ static int __init setup_notify(struct ib
int ret;
if (!*ibm->handle)
- return 0;
+ return 1;
ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
if (ret < 0) {
printk(IBM_ERR "%s device not present\n", ibm->name);
- return 0;
+ return 1;
}
acpi_driver_data(ibm->device) = ibm;
@@ -1811,6 +1811,8 @@ static int __init ibm_init(struct ibm_st
ret = setup_notify(ibm);
if (ret < 0)
return ret;
+ if (ret > 0)
+ return 0;
ibm->notify_installed = 1;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-04-12 21:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-12 13:32 [PATCH] Fix Thinkpad A21m shutdown Thomas Renninger
2006-04-12 21:40 ` Borislav Deianov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox