commit 5f48047756339065df3e6fead381978abb0bc557
author Kristian Høgsberg <krh@redhat.com> Wed Mar 07 12:12:39 2007 -0500
committer Stefan Richter <stefanr@s5r6.in-berlin.de> Fri Mar 09 22:03:07 2007 +0100
tree c13766ebd8900e6662e7117beea67da80363e28a
parent e254a4b45f265d9df120b83d5c2c9437902b601b

firewire: Iterate through units in a keventd callback for update callbacks.

We can't take the klist lock for the child device list in interrupt
context.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

drivers/firewire/fw-device.c

diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index e8f2dc3..5599265 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -530,6 +530,14 @@
 	return 0;
 }
 
+static void fw_device_update(struct work_struct *work)
+{
+	struct fw_device *device =
+		container_of(work, struct fw_device, work.work);
+
+	device_for_each_child(&device->device, NULL, update_unit);
+}
+
 void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
 {
 	struct fw_device *device;
@@ -577,7 +585,10 @@
 		device = node->data;
 		device->node_id = node->node_id;
 		device->generation = card->generation;
-		device_for_each_child(&device->device, NULL, update_unit);
+		if (atomic_read(&device->state) == FW_DEVICE_RUNNING) {
+			PREPARE_DELAYED_WORK(&device->work, fw_device_update);
+			schedule_delayed_work(&device->work, 0);
+		}
 		break;
 
 	case FW_NODE_DESTROYED:
@@ -597,8 +608,8 @@
 		 * to create the device. */
 		device = node->data;
 		if (atomic_xchg(&device->state,
-			 FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {
-			INIT_DELAYED_WORK(&device->work, fw_device_shutdown);
+				FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {
+			PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
 			schedule_delayed_work(&device->work, 0);
 		}
 		break;