From c1a40e6fbcec0d86c0c977bd6d79ff0f6baf2bff Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Thu, 7 Sep 2006 15:52:00 +0200 Subject: [PATCH] --- yaml --- r: 37298 b: refs/heads/master c: cf82703dc6f8197341ca6be33cd38e80332685f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f61e5a8d1d18..255e164212ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e238cd42be6c0852da519303cf0182690f8d9f +refs/heads/master: cf82703dc6f8197341ca6be33cd38e80332685f0 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index 9890ab73bb5f..4622c99c12f2 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/drivers/ieee1394/ohci1394.c @@ -2739,7 +2739,7 @@ static void dma_rcv_tasklet (unsigned long data) (cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f, (cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>21)&0x3, tcode, length, d->ctx, - (cond_le32_to_cpu(d->spb[0], ohci->no_swap_incoming)>>10)&0x3f); + (d->spb[0]>>10)&0x3f); ack = (((cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f) == 0x11) ? 1 : 0;