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

Commit e747a5c0 authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: core: optimize card shutdown 



This fixes a regression by "firewire: keep highlevel drivers attached
during brief connection loss":  There were 2 seconds unnecessary waiting
added to the shutdown procedure of each controller.

We use card->link as status flag to signal the device handler that there
is no use to wait for a come-back.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 64c634ef

drivers/firewire/fw-card.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ fw_core_remove_card(struct fw_card *card) 
	fw_core_initiate_bus_reset(card, 1);



	mutex_lock(&card_mutex);

	list_del(&card->link);

	list_del_init(&card->link);

	mutex_unlock(&card_mutex);



	/* Set up the dummy driver. */

drivers/firewire/fw-device.c

+4 −2
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ static void fw_device_shutdown(struct work_struct *work) 
		container_of(work, struct fw_device, work.work);

	int minor = MINOR(device->device.devt);



	if (time_is_after_jiffies(device->card->reset_jiffies + SHUTDOWN_DELAY)) {

	if (time_is_after_jiffies(device->card->reset_jiffies + SHUTDOWN_DELAY)

	    && !list_empty(&device->card->link)) {

		schedule_delayed_work(&device->work, SHUTDOWN_DELAY);

		return;

	}
@@ -1074,7 +1075,8 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) 
		if (atomic_xchg(&device->state,

				FW_DEVICE_GONE) == FW_DEVICE_RUNNING) {

			PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);

			schedule_delayed_work(&device->work, SHUTDOWN_DELAY);

			schedule_delayed_work(&device->work,

				list_empty(&card->link) ? 0 : SHUTDOWN_DELAY);

		}

		break;

	}