aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-11-19 13:19:40 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-11-19 13:19:40 +1100
commit3860d7818d7d6318753988c92b0fb72bf8440531 (patch)
tree063484642d02f5f8320652cbc1072e562d7793fe
parentef2c9ad578818e54c8d23b74f17e383b9ec5e3d3 (diff)
parenta0aede15d4962b384b968f87b1f9ec9eb98f9152 (diff)
Merge remote-tracking branch 'coresight/next'
-rw-r--r--drivers/hwtracing/coresight/coresight.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index e25492137d8b..93738dfbf631 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -548,7 +548,7 @@ static int coresight_name_match(struct device *dev, void *data)
to_match = data;
i_csdev = to_coresight_device(dev);
- if (!strcmp(to_match, dev_name(&i_csdev->dev)))
+ if (to_match && !strcmp(to_match, dev_name(&i_csdev->dev)))
return 1;
return 0;