While poking around in the dock driver debugging the NULL ptr that Rafael fixed, I found the driver a little hard to read. Here is a modest attempt to clean it up a little, and is intended as 2.6.33 material. Compile-tested only. I have access to an HP nc6220 and nc6230, but neither of them seem to provide the _DCK method, which is needed for the dock driver. Thanks. /ac --- Alex Chiang (6): ACPI: dock: clean up error handling paths in dock_add() ACPI: dock: rename local variable 'dock_station' in dock_add() ACPI: dock: clean up one more error path in dock_add() ACPI: dock: add struct dock_station * directly to platform device data ACPI: dock: combine add|alloc_dock_dependent_device ACPI: dock: minor whitespace and style cleanups drivers/acpi/dock.c | 259 ++++++++++++++++++++------------------------------- 1 files changed, 104 insertions(+), 155 deletions(-) -- 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