On Wed 24. Sep - 10:51:05, Shaohua Li wrote: > On Mon, 2008-09-22 at 18:57 +0800, Holger Macht wrote: > > On Thu 28. Aug - 10:02:03, Shaohua Li wrote: > > > In some BIOSes, every _STA method call will send a notification again, > > > this cause freeze. And in some BIOSes, it appears _STA should be called > > > after _DCK. This tries to avoid calls _STA, and still keep the device > > > present check. > > > http://bugzilla.kernel.org/show_bug.cgi?id=10431 > > > > Finally found some time to test this... > > > > > > > > Signed-off-by: Shaohua Li <shaohua.li@xxxxxxxxx> > > > --- > > > drivers/acpi/dock.c | 5 ++++- > > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > Index: linux/drivers/acpi/dock.c > > > =================================================================== > > > --- linux.orig/drivers/acpi/dock.c 2008-08-27 14:38:44.000000000 +0800 > > > +++ linux/drivers/acpi/dock.c 2008-08-28 09:33:02.000000000 +0800 > > > @@ -604,14 +604,17 @@ static int handle_eject_request(struct d > > > static void dock_notify(acpi_handle handle, u32 event, void *data) > > > { > > > struct dock_station *ds = data; > > > + struct acpi_device *tmp; > > > > > > switch (event) { > > > case ACPI_NOTIFY_BUS_CHECK: > > > - if (!dock_in_progress(ds) && dock_present(ds)) { > > > + if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle, > > > > On the Thinkpad X60, when booting undocked, the first time I dock, > > acpi_bus_get_device() returns 0, so hotplug is not performed > > properly. Second time (undock->dock), it works. > So the patch breaks your X60? acpi_bus_get_device() returns 0 means the > device is already in ACPI device tree, but it shouldn't as it's not > present. Well, it does not really break it, I just have to dock a second time :-) This second time, acpi_bus_get_device() return -ENODEV. So for this laptop, the old way with dock_present() (checking _STA) would work just fine. Regards, Holger -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
