Merge branch 'linus' into timers/core

Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 833139ce1e22..e22c148e4b7f 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -164,7 +164,7 @@ static void ddebug_change(const struct ddebug_query *query,
 
                         if (!newflags)
                                 dt->num_enabled--;
-                        else if (!dp-flags)
+                        else if (!dp->flags)
                                 dt->num_enabled++;
                         dp->flags = newflags;
                         if (newflags) {