From 7a3886be9ac20a2ba6f6926692c28a0c0b56ae93 Mon Sep 17 00:00:00 2001 From: Karsten Wiese Date: Sun, 30 Dec 2007 21:55:05 -0800 Subject: [PATCH] --- yaml --- r: 82262 b: refs/heads/master c: 3b6fcfd0664aeac6ae2fd1231f04b3ed24723c1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-sched.c | 4 ++-- trunk/drivers/usb/host/ehci.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d5a26d5afe6..7119a50b456c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91bc4d31e81b15aa6e2d075307b8727041f2e2d1 +refs/heads/master: 3b6fcfd0664aeac6ae2fd1231f04b3ed24723c1e diff --git a/trunk/drivers/usb/host/ehci-sched.c b/trunk/drivers/usb/host/ehci-sched.c index 1c771045ccaa..1a94e6cec419 100644 --- a/trunk/drivers/usb/host/ehci-sched.c +++ b/trunk/drivers/usb/host/ehci-sched.c @@ -119,7 +119,8 @@ periodic_usecs (struct ehci_hcd *ehci, unsigned frame, unsigned uframe) q = &q->fstn->fstn_next; break; case Q_TYPE_ITD: - usecs += q->itd->usecs [uframe]; + if (q->itd->hw_transaction[uframe]) + usecs += q->itd->stream->usecs; hw_p = &q->itd->hw_next; q = &q->itd->itd_next; break; @@ -1536,7 +1537,6 @@ itd_link_urb ( uframe = next_uframe & 0x07; frame = next_uframe >> 3; - itd->usecs [uframe] = stream->usecs; itd_patch(ehci, itd, iso_sched, packet, uframe); next_uframe += stream->interval; diff --git a/trunk/drivers/usb/host/ehci.h b/trunk/drivers/usb/host/ehci.h index f83472856a80..42969e9d8c44 100644 --- a/trunk/drivers/usb/host/ehci.h +++ b/trunk/drivers/usb/host/ehci.h @@ -602,7 +602,6 @@ struct ehci_itd { unsigned frame; /* where scheduled */ unsigned pg; unsigned index[8]; /* in urb->iso_frame_desc */ - u8 usecs[8]; } __attribute__ ((aligned (32))); /*-------------------------------------------------------------------------*/