1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index a320ab48edd6..4dd66c1a36da 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/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);