From 56d250790ed4dfc41e0d720b480066f4320bdd76 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 19 Jan 2015 16:36:46 -0600 Subject: [PATCH] musb_cppi41: fix mismerge: https://github.com/beagleboard/linux/issues/18 Signed-off-by: Robert Nelson --- drivers/usb/musb/musb_cppi41.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c index eb9ede3630c5a..d616bdf033548 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -282,7 +282,7 @@ static void cppi41_dma_callback(void *private_data) list_add_tail(&cppi41_channel->tx_check, &controller->early_tx_list); - if (!hrtimer_active(&controller->early_tx)) { + if (!hrtimer_is_queued(&controller->early_tx)) { unsigned long usecs = cppi41_channel->total_len / 10; hrtimer_start_range_ns(&controller->early_tx, ktime_set(0, usecs * NSEC_PER_USEC),