musb_cppi41: fix mismerge: #18

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Mar 4, 2015 · 0f323e2 · 0f323e2
1 parent f5f5774
commit 0f323e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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),