From ea324352652122df355faef38ad9aa9d3b9bdfd5 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Sat, 11 Apr 2009 15:52:51 +0800
Subject: [PATCH] --- yaml --- r: 143117 b: refs/heads/master c:
 a3e0ab050774117d4a6173087c8bf3888662a83f h: refs/heads/master i:   143115:
 432f019cf55673c8f8882a6752a66b668a3a1b73 v: v3

---
 [refs]                                   | 2 +-
 trunk/kernel/trace/trace_events_filter.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f2bde5e23578..5760ac659fcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcabd91c271e50eebc0cb9220ac92700332b452e
+refs/heads/master: a3e0ab050774117d4a6173087c8bf3888662a83f
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
index 9d2162fd2305..49b3ef54ec46 100644
--- a/trunk/kernel/trace/trace_events_filter.c
+++ b/trunk/kernel/trace/trace_events_filter.c
@@ -419,12 +419,13 @@ int filter_parse(char **pbuf, struct filter_pred *pred)
 	if (!pred->field_name)
 		return -ENOMEM;
 
-	pred->val = simple_strtoull(val_str, &tmp, 10);
+	pred->val = simple_strtoull(val_str, &tmp, 0);
 	if (tmp == val_str) {
 		pred->str_val = kstrdup(val_str, GFP_KERNEL);
 		if (!pred->str_val)
 			return -ENOMEM;
-	}
+	} else if (*tmp != '\0')
+		return -EINVAL;
 
 	return 0;
 }