From 7749652b96e2c58197b4096bbff71f437f715cc5 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 5 Jan 2009 20:28:10 +0100 Subject: [PATCH] --- yaml --- r: 136013 b: refs/heads/master c: 36a755cfc398fc50abc74055d4478c1b067dac55 h: refs/heads/master i: 136011: d28e46e5f89d38e9d0cfab8986e17d82846689f6 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-cdev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 56bbadc63d73..10269d3e3ba7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ba949868a6dc082b24cba5c3bf3f50de7391433 +refs/heads/master: 36a755cfc398fc50abc74055d4478c1b067dac55 diff --git a/trunk/drivers/firewire/fw-cdev.c b/trunk/drivers/firewire/fw-cdev.c index 3d816a6395cd..b93ad9c0a0d0 100644 --- a/trunk/drivers/firewire/fw-cdev.c +++ b/trunk/drivers/firewire/fw-cdev.c @@ -1386,12 +1386,12 @@ static int fw_device_op_release(struct inode *inode, struct file *file) list_del(&client->link); mutex_unlock(&client->device->client_list_mutex); - if (client->buffer.pages) - fw_iso_buffer_destroy(&client->buffer, client->device->card); - if (client->iso_context) fw_iso_context_destroy(client->iso_context); + if (client->buffer.pages) + fw_iso_buffer_destroy(&client->buffer, client->device->card); + /* Freeze client->resource_idr and client->event_list */ spin_lock_irq(&client->lock); client->in_shutdown = true;