diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
| commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
| tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/usb/host/ehci-sched.c | |
| parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index 4a0c5a78b2ed..a081ee65bde6 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c | |||
| @@ -918,7 +918,7 @@ iso_stream_init ( | |||
| 918 | */ | 918 | */ |
| 919 | stream->usecs = HS_USECS_ISO (maxp); | 919 | stream->usecs = HS_USECS_ISO (maxp); |
| 920 | bandwidth = stream->usecs * 8; | 920 | bandwidth = stream->usecs * 8; |
| 921 | bandwidth /= 1 << (interval - 1); | 921 | bandwidth /= interval; |
| 922 | 922 | ||
| 923 | } else { | 923 | } else { |
| 924 | u32 addr; | 924 | u32 addr; |
| @@ -951,7 +951,7 @@ iso_stream_init ( | |||
| 951 | } else | 951 | } else |
| 952 | stream->raw_mask = smask_out [hs_transfers - 1]; | 952 | stream->raw_mask = smask_out [hs_transfers - 1]; |
| 953 | bandwidth = stream->usecs + stream->c_usecs; | 953 | bandwidth = stream->usecs + stream->c_usecs; |
| 954 | bandwidth /= 1 << (interval + 2); | 954 | bandwidth /= interval << 3; |
| 955 | 955 | ||
| 956 | /* stream->splits gets created from raw_mask later */ | 956 | /* stream->splits gets created from raw_mask later */ |
| 957 | stream->address = cpu_to_hc32(ehci, addr); | 957 | stream->address = cpu_to_hc32(ehci, addr); |