[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100201163043.GA3240@think>
Date: Mon, 1 Feb 2010 11:30:44 -0500
From: Chris Mason <chris.mason@...cle.com>
To: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
Alex Chiang <achiang@...com>
Subject: [PATCH] set dock_station->flags to zero during dock_add
Before fe06fba292af5ed5c1c6ad9af3a9ef68da7a5088 the dock_station struct
was allocated and zero filled by kzalloc. Now it is allocated by
platform_device_register_data(), apparently via a kmemdup of a variable
on the stack?
Now we no longer init dock_station->flags to zero, and my x60 laptop was
lucky enough to always have DOCK_DOCKING set. So, I always saw -EBUSY
when I tried to undock.
With the patch below, I can dock and undock properly again. I double
checked that dock_station->flags was the only field that we were not
setting up.
This was just brute force guessing, I have no idea what this code does.
Signed-off-by: Chris Mason <chris.mason@...cle.com>
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bbc2c13..0a449ad 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -944,6 +945,7 @@ static int dock_add(acpi_handle handle)
dock_station->handle = handle;
dock_station->dock_device = dd;
dock_station->last_dock_time = jiffies - HZ;
+ dock_station->flags = 0;
mutex_init(&dock_station->hp_lock);
spin_lock_init(&dock_station->dd_lock);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists