musb: add fix for beagleboard/linux#18

Signed-off-by: Robert Nelson <[email protected]>

patch.sh

@@ -94,7 +94,9 @@ fixes () {
 	if [ "x${regenerate}" = "xenable" ] ; then
 		start_cleanup
 	fi
-#	${git} "${DIR}/patches/fixes/0001-The-current-system-of-setting-channels-to-inactive-p.patch"
+
+	${git} "${DIR}/patches/fixes/0001-musb_cppi41-fix-mismerge-https-github.com-beagleboar.patch"
+
 	if [ "x${regenerate}" = "xenable" ] ; then
 		number=1
 		cleanup

patches/fixes/0001-musb_cppi41-fix-mismerge-https-github.com-beagleboar.patch

@@ -0,0 +1,27 @@
+From 88bce365a560e3c8b64d9ad654e980d11d7382e5 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <[email protected]>
+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 <[email protected]>
+---
+ 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 eb9ede3..d616bdf 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),
+-- 
+2.1.4
+

version.sh

@@ -25,7 +25,7 @@ toolchain="gcc_linaro_gnueabihf_4_8"
 #Kernel/Build
 KERNEL_REL=3.14
 KERNEL_TAG=${KERNEL_REL}.29
-BUILD=${build_prefix}-r44.2
+BUILD=${build_prefix}-r44.3
 
 #v3.X-rcX + upto SHA
 #KERNEL_SHA=""