Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: sbp2: parallelize login, reconnect, logout
  firewire: sbp2: octlet AT payloads can be stack-allocated
  firewire: sbp2: omit Scsi_Host lock from queuecommand
  firewire: core: use non-reentrant workqueue with rescuer
  firewire: optimize iso queueing by setting wake only after the last packet
  firewire: octlet AT payloads can be stack-allocated
  firewire: ohci: optimize find_branch_descriptor()
  firewire: ohci: avoid separate DMA mapping for small AT payloads
  firewire: ohci: do not start DMA contexts before link is enabled

2 files changed, 2 insertions, 14 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c
index fc5ccd8c923a..21c52e3b522e 100644
--- a/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/drivers/media/dvb/firewire/firedtv-avc.c
@@ -1320,14 +1320,10 @@ static int cmp_read(struct firedtv *fdtv, u64 addr, __be32 *data)
 {
         int ret;
 
-        mutex_lock(&fdtv->avc_mutex);
-
         ret = fdtv_read(fdtv, addr, data);
         if (ret < 0)
                 dev_err(fdtv->device, "CMP: read I/O error\n");
 
-        mutex_unlock(&fdtv->avc_mutex);
-
         return ret;
 }
 
@@ -1335,18 +1331,9 @@ static int cmp_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
 {
         int ret;
 
-        mutex_lock(&fdtv->avc_mutex);
-
-        /* data[] is stack-allocated and should not be DMA-mapped. */
-        memcpy(fdtv->avc_data, data, 8);
-
-        ret = fdtv_lock(fdtv, addr, fdtv->avc_data);
+        ret = fdtv_lock(fdtv, addr, data);
         if (ret < 0)
                 dev_err(fdtv->device, "CMP: lock I/O error\n");
-        else
-                memcpy(data, fdtv->avc_data, 8);
-
-        mutex_unlock(&fdtv->avc_mutex);
 
         return ret;
 }
diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index 8022b743af91..864b6274c729 100644
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -125,6 +125,7 @@ static void handle_iso(struct fw_iso_context *context, u32 cycle,
 
                 i = (i + 1) & (N_PACKETS - 1);
         }
+        fw_iso_context_queue_flush(ctx->context);
         ctx->current_packet = i;
 }