Merge commit 'kumar/next' into merge

[mv-sheeva.git] / drivers / media / dvb / firewire / firedtv-fw.c

diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index 6954848b58034b27649257597a898dee4643e023..fe44789ab03793fed09a9740e8622b9b798ceadc 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -46,10 +46,9 @@ static int node_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
        return node_req(fdtv, addr, data, 8, TCODE_LOCK_COMPARE_SWAP);
 }
 
-static int node_read(struct firedtv *fdtv, u64 addr, void *data, size_t len)
+static int node_read(struct firedtv *fdtv, u64 addr, void *data)
 {
-       return node_req(fdtv, addr, data, len, len == 4 ?
-                       TCODE_READ_QUADLET_REQUEST : TCODE_READ_BLOCK_REQUEST);
+       return node_req(fdtv, addr, data, 4, TCODE_READ_QUADLET_REQUEST);
 }
 
 static int node_write(struct firedtv *fdtv, u64 addr, void *data, size_t len)
@@ -79,19 +78,14 @@ struct firedtv_receive_context {
 static int queue_iso(struct firedtv_receive_context *ctx, int index)
 {
        struct fw_iso_packet p;
-       int err;
 
        p.payload_length = MAX_PACKET_SIZE;
-       p.interrupt = !(ctx->interrupt_packet & (IRQ_INTERVAL - 1));
+       p.interrupt = !(++ctx->interrupt_packet & (IRQ_INTERVAL - 1));
        p.skip = 0;
        p.header_length = ISO_HEADER_SIZE;
 
-       err = fw_iso_context_queue(ctx->context, &p, &ctx->buffer,
-                                  index * MAX_PACKET_SIZE);
-       if (!err)
-               ctx->interrupt_packet++;
-
-       return err;
+       return fw_iso_context_queue(ctx->context, &p, &ctx->buffer,
+                                   index * MAX_PACKET_SIZE);
 }
 
 static void handle_iso(struct fw_iso_context *context, u32 cycle,
@@ -150,7 +144,7 @@ static int start_iso(struct firedtv *fdtv)
        if (err)
                goto fail_context_destroy;
 
-       ctx->interrupt_packet = 1;
+       ctx->interrupt_packet = 0;
        ctx->current_packet = 0;
 
        for (i = 0; i < N_PAGES; i++)