summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-01 19:23:28 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-01 19:23:27 -0800
commite03dcc58885fafdba503c1933820d23d4b88103a (patch)
treef0d1da8097a587545ddab4893c96639c628fa929 /drivers
parentaf883d4db0b398542bb561808a11019f0998d129 (diff)
parente11aa6adb6664ef03c212912553c44f3f6b43492 (diff)
Merge "defconfig: arm64: Add coresight TMC support for msm8998"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwtracing/coresight/coresight.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index c34599c0594d..9b0cc7baca73 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2016 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012, 2016-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -309,6 +309,9 @@ static int coresight_build_paths(struct coresight_device *csdev,
int i, ret = -EINVAL;
struct coresight_connection *conn;
+ if (!csdev)
+ return ret;
+
list_add(&csdev->path_link, path);
if ((csdev->type == CORESIGHT_DEV_TYPE_SINK ||