summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-04-23 13:23:47 +0300
committerSteven Rostedt <rostedt@goodmis.org>2016-04-26 09:40:20 -0400
commit4812952f9c94f67b3cc78ad0a6482bf182aa5a44 (patch)
tree8bfdaabe504c543b37ee9d99ac0b5e61082a571b /kernel/trace
parent205506228b69be4efbb3809957a69420f26a8d9f (diff)
downloadlinux-sh-4812952f9c94f67b3cc78ad0a6482bf182aa5a44.tar.gz
tracing: checking for NULL instead of IS_ERR()
tracing_map_elt_alloc() returns ERR_PTRs on error, never NULL. Fixes: 08d43a5fa063 ('tracing: Add lock-free tracing_map') Link: http://lkml.kernel.org/r/20160423102347.GA11136@mwanda Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/tracing_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index e0f172932eca..e7dfc5eec669 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -814,7 +814,7 @@ static struct tracing_map_elt *copy_elt(struct tracing_map_elt *elt)
unsigned int i;
dup_elt = tracing_map_elt_alloc(elt->map);
- if (!dup_elt)
+ if (IS_ERR(dup_elt))
return NULL;
if (elt->map->ops && elt->map->ops->elt_copy)