From b3df8a28f48e4d609e5e587fcd7423b50d2ff02a Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 14 Dec 2008 19:19:23 +0100 Subject: [PATCH] --- yaml --- r: 135991 b: refs/heads/master c: 97811e347310766030a648fdf0e407b2c91a39c1 h: refs/heads/master i: 135989: 202bff6517b06144d7ff04a7f8786209c07c6bfc 135987: d92a0b0d2a2255280a2986b7479ed9698655300b 135983: 94b44d36d709b6c848e57e714a44bef4f5e334ae v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-cdev.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 43fc443fd056..84d040431b8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f3125af8ed7410cc0ebcc0acd59bbfc1ae0057a +refs/heads/master: 97811e347310766030a648fdf0e407b2c91a39c1 diff --git a/trunk/drivers/firewire/fw-cdev.c b/trunk/drivers/firewire/fw-cdev.c index a320ab48edd6..4dd66c1a36da 100644 --- a/trunk/drivers/firewire/fw-cdev.c +++ b/trunk/drivers/firewire/fw-cdev.c @@ -1009,6 +1009,10 @@ static int fw_device_op_release(struct inode *inode, struct file *file) struct event *e, *next_e; struct client_resource *r, *next_r; + mutex_lock(&client->device->client_list_mutex); + list_del(&client->link); + mutex_unlock(&client->device->client_list_mutex); + if (client->buffer.pages) fw_iso_buffer_destroy(&client->buffer, client->device->card); @@ -1026,10 +1030,6 @@ static int fw_device_op_release(struct inode *inode, struct file *file) list_for_each_entry_safe(e, next_e, &client->event_list, link) kfree(e); - mutex_lock(&client->device->client_list_mutex); - list_del(&client->link); - mutex_unlock(&client->device->client_list_mutex); - fw_device_put(client->device); kfree(client);