diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-05 20:28:10 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 20:56:46 +0100 |
| commit | 36a755cfc398fc50abc74055d4478c1b067dac55 (patch) | |
| tree | fbf8208d5b0314ee9b523a9edaf0b3343e4add39 /drivers/firewire | |
| parent | 3ba949868a6dc082b24cba5c3bf3f50de7391433 (diff) | |
| download | linux-3.10-36a755cfc398fc50abc74055d4478c1b067dac55.tar.gz linux-3.10-36a755cfc398fc50abc74055d4478c1b067dac55.tar.bz2 linux-3.10-36a755cfc398fc50abc74055d4478c1b067dac55.zip | |
firewire: cdev: shut down iso context before freeing the buffer
DMA must be halted before we DMA-unmap and free the DMA buffer. Since
we cannot rely on the client to stop the context before it closes the
fd, we have to reorder fw_iso_buffer_destroy vs. fw_iso_context_destroy.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/fw-cdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index 3d816a6395c..b93ad9c0a0d 100644 --- a/drivers/firewire/fw-cdev.c +++ b/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; |