diff --git a/[refs] b/[refs]
index 289623559108..16185308a3e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7f9f4536a09f9f73c800663df2e600c9405e1ef
+refs/heads/master: 643167423858052c26b2dfaf332c1ec0b472ea7a
diff --git a/trunk/drivers/staging/lttng/probes/lttng-events.h b/trunk/drivers/staging/lttng/probes/lttng-events.h
index ff6273fb3541..d486994f3a0c 100644
--- a/trunk/drivers/staging/lttng/probes/lttng-events.h
+++ b/trunk/drivers/staging/lttng/probes/lttng-events.h
@@ -347,7 +347,7 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
 #undef __string_from_user
 #define __string_from_user(_item, _src)					       \
 	__event_len += __dynamic_len[__dynamic_len_idx++] =		       \
-		min_t(size_t, strlen_user(_src), 1);
+		max_t(size_t, strlen_user(_src), 1);
 
 #undef TP_PROTO
 #define TP_PROTO(args...) args
@@ -557,7 +557,7 @@ __assign_##dest##_2:							\
 			(void) __typemap.dest;				\
 		lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest));\
 		__ustrlen = __get_dynamic_array_len(dest);		\
-		if (likely(__ustrlen) > 1) {				\
+		if (likely(__ustrlen > 1)) {				\
 			__chan->ops->event_write_from_user(&__ctx, src,	\
 				__ustrlen - 1);				\
 		}							\