Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f480477 authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Stefan Richter
Browse files

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: default avatarKristian Høgsberg <krh@redhat.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent e254a4b4

drivers/firewire/fw-device.c

+14 −3
Original line number Diff line number Diff line
@@ -530,6 +530,14 @@ static int update_unit(struct device *dev, void *data) 
	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 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) 
		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:
@@ -598,7 +609,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) 
		device = node->data;

		if (atomic_xchg(&device->state,

				FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {

			INIT_DELAYED_WORK(&device->work, fw_device_shutdown);

			PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);

			schedule_delayed_work(&device->work, 0);

		}

		break;