diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-01 02:22:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-01 02:22:50 -0800 |
| commit | 1022064012ded65a023252e0b65b142f705eb8dc (patch) | |
| tree | b190dfb8e42c75b29992c754d9eec83276af3e0c | |
| parent | c1759c340951ee897373527925c40598ae5b6ab1 (diff) | |
| parent | 3f8c010896c7f8ab5f4fc634497408146b42cb40 (diff) | |
Merge "coresight-tpdm: fix multiple datasets allocation issue"
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-tpdm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c index 3a11b061e5b0..596a36ed7dba 100644 --- a/drivers/hwtracing/coresight/coresight-tpdm.c +++ b/drivers/hwtracing/coresight/coresight-tpdm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-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 @@ -3725,12 +3725,6 @@ static int tpdm_probe(struct platform_device *pdev) clk_disable_unprepare(drvdata->clk); - ret = tpdm_datasets_alloc(drvdata); - if (ret) - return ret; - - tpdm_init_default_data(drvdata); - drvdata->traceid = traceid++; desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); |