projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
[cascardo/linux.git]
/
drivers
/
usb
/
musb
/
musb_cppi41.c
diff --git
a/drivers/usb/musb/musb_cppi41.c
b/drivers/usb/musb/musb_cppi41.c
index
7b8bbf5
..
5341bb2
100644
(file)
--- a/
drivers/usb/musb/musb_cppi41.c
+++ b/
drivers/usb/musb/musb_cppi41.c
@@
-318,7
+318,7
@@
static void cppi41_dma_callback(void *private_data)
}
list_add_tail(&cppi41_channel->tx_check,
&controller->early_tx_list);
}
list_add_tail(&cppi41_channel->tx_check,
&controller->early_tx_list);
- if (!hrtimer_
active
(&controller->early_tx)) {
+ if (!hrtimer_
is_queued
(&controller->early_tx)) {
hrtimer_start_range_ns(&controller->early_tx,
ktime_set(0, 140 * NSEC_PER_USEC),
40 * NSEC_PER_USEC,
hrtimer_start_range_ns(&controller->early_tx,
ktime_set(0, 140 * NSEC_PER_USEC),
40 * NSEC_PER_USEC,