Skip to contentSkip to conversation

bcusdk: eibd: drop local clock_gettime in USB backends

PATCH New Kurt Van Dijck 3 participants 3 messages Aug 25, 2017 – Sep 6, 2017

lore
Share & tools
lore

Kurt Van Dijck

author
#0 lore raw

PATCH v2 1/1 bcusdk: eibd: drop local clock_gettime in USB backends

clock_gettime is defined locally, and calls pth_int_time, which in turn calls clock_gettime.
The USB backend shouldn't overrule clock_gettime in the first place. This patch fixes this endless recursion by removing the local defition.

Signed-off-by Kurt Van Dijck <[email protected]>
---
 ...endless-recursion-when-using-USB-backends.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch
package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch new file +35 -0
new file mode 100644
index 0000000..3b90289
@@ -0,0 +1,35 @@
+From 6bd1b4958e949d83468e053c34bf6c89d14d687a Mon Sep 17 00:00:00 2001
+From: Kurt Van Dijck <[email protected]>
+Date: Fri, 25 Aug 2017 23:01:14 +0200
+Subject: [PATCH] eibd: drop local clock_gettime in USB backends
+
+clock_gettime is defined locally, and calls pth_int_time, which
+in turn calls clock_gettime.
+The USB backend shouldn't overrule clock_gettime in the first place.
+This patch fixes this endless recursion by removing the local defition.
+
+Signed-off-by: Kurt Van Dijck <[email protected]>
+---
+ eibd/usb/linux_usbfs.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/eibd/usb/linux_usbfs.c b/eibd/usb/linux_usbfs.c
+index c3ec410..957b908 100644
+--- a/eibd/usb/linux_usbfs.c
++++ b/eibd/usb/linux_usbfs.c
+@@ -52,12 +52,6 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
+ 	return 0;
+ }
+ 
+-int clock_gettime(clockid_t clk_id, struct timespec *tp)
+-{
+-	pth_int_time (tp);
+-	return 0;
+-}
+-
+ /* sysfs vs usbfs:
+  * opening a usbfs node causes the device to be resumed, so we attempt to
+  * avoid this during enumeration.
+-- 
+1.8.5.rc3
+
Signature · 1 line
1.8.5.rc3
Applied
#1 lore raw

PATCH v2 1/1 bcusdk: eibd: drop local clock_gettime in USB backends

Hello,

Quoted 10 lines · Kurt Van Dijck

clock_gettime is defined locally, and calls pth_int_time, which in turn calls clock_gettime.
The USB backend shouldn't overrule clock_gettime in the first place. This patch fixes this endless recursion by removing the local defition.

Signed-off-by Kurt Van Dijck <[email protected]>
---
 ...endless-recursion-when-using-USB-backends.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 bcusdk: eibd: drop local clock_gettime in USB backends

In reply to Kurt Van Dijck
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Kurt" == Kurt Van Dijck <[email protected]> writes:

clock_gettime is defined locally, and calls pth_int_time, which in turn calls clock_gettime.
The USB backend shouldn't overrule clock_gettime in the first place. This patch fixes this endless recursion by removing the local defition.

Signed-off-by Kurt Van Dijck <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard