tree 3b04fbebf69951526baeb2eb5453baa3f68f7fc0 parent 8d134db051134c38ae6bf36034403c7da7f0e3da author Jody McIntyre <[EMAIL PROTECTED]> Fri, 22 Apr 2005 04:09:42 -0700 committer Linus Torvalds <[EMAIL PROTECTED]> Fri, 22 Apr 2005 04:09:42 -0700
[PATCH] ohci1394: tlabels misprinted in DBGMSG - Print the correct value in the DBGMSG in dma_rcv_tasklet(). See OHCI 1.1 section 8.7, page 103 ff. - Print tlabels as %d everywhere. Signed-off-by: Stefan Richter <[EMAIL PROTECTED]> Signed-off-by: Jody McIntyre <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> ieee1394/ohci1394.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: drivers/ieee1394/ohci1394.c =================================================================== --- 63cc8a56a915587bc51f5519ed5cd8d7ee84a05d/drivers/ieee1394/ohci1394.c (mode:100644 sha1:97ff364c04341ef866ecd4d70e60e0a1e415b743) +++ 3b04fbebf69951526baeb2eb5453baa3f68f7fc0/drivers/ieee1394/ohci1394.c (mode:100644 sha1:72830e6fde459039384df87329855b5710ee4114) @@ -2691,7 +2691,7 @@ static void dma_rcv_tasklet (unsigned lo (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[length/4-1], ohci->no_swap_incoming)>>10)&0x3f); + (cond_le32_to_cpu(d->spb[0], ohci->no_swap_incoming)>>10)&0x3f); ack = (((cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f) == 0x11) ? 1 : 0; @@ -2754,7 +2754,7 @@ static void dma_trm_tasklet (unsigned lo d->ctx); else DBGMSG("Packet sent to node %d tcode=0x%X tLabel=" - "0x%02X ack=0x%X spd=%d dataLength=%d ctx=%d", + "%d ack=0x%X spd=%d dataLength=%d ctx=%d", (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1])>>16)&0x3f, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>4)&0xf, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>10)&0x3f, @@ -2763,7 +2763,7 @@ static void dma_trm_tasklet (unsigned lo d->ctx); else DBGMSG("Packet sent to node %d tcode=0x%X tLabel=" - "0x%02X ack=0x%X spd=%d data=0x%08X ctx=%d", + "%d ack=0x%X spd=%d data=0x%08X ctx=%d", (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1]) >>16)&0x3f, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0]) - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html