malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "coresight: stm: Fix null point issue in stm"

Browse Source
This commit is contained in:
qctecmdr Service 2018-05-23 05:27:55 -07:00 committed by Gerrit - the friendly Code Review server
commit 3d534c1853
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hwtracing/coresight/coresight-ost.c
View File

@ -281,14 +281,13 @@ EXPORT_SYMBOL(stm_ost_packet);
int stm_set_ost_params(struct stm_drvdata *drvdata, size_t bitmap_size)
{
stmdrvdata = drvdata;
drvdata->chs.bitmap = devm_kzalloc(drvdata->dev, bitmap_size,
GFP_KERNEL);
if (!drvdata->chs.bitmap)
return -ENOMEM;
bitmap_fill(drvdata->entities, OST_ENTITY_MAX);
stmdrvdata = drvdata;
return 0;
}

10
drivers/hwtracing/coresight/coresight-stm.c
View File

@ -870,11 +870,6 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
BYTES_PER_CHANNEL), resource_size(res));
}
bitmap_size = BITS_TO_LONGS(drvdata->numsp) * sizeof(long);
/* Store the driver data pointer for use in exported functions */
ret = stm_set_ost_params(drvdata, bitmap_size);
if (ret)
return ret;
guaranteed = devm_kzalloc(dev, bitmap_size, GFP_KERNEL);
if (!guaranteed)
@ -904,6 +899,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
goto stm_unregister;
}
/* Store the driver data pointer for use in exported functions */
ret = stm_set_ost_params(drvdata, bitmap_size);
if (ret)
goto stm_unregister;
pm_runtime_put(&adev->dev);
dev_info(dev, "%s initialized with master %s\n", (char *)id->data,