coresight: cti: Fix remove sysfs link error
CTI code to remove sysfs link to other devices on shutdown, incorrectly tries to remove a single ended link when these are all double ended. This implementation leaves elements in the link info structure undefined which results in a crash in recent tests for driver module unload. This patch corrects the link removal code. Fixes: 73274abb6557 ("coresight: cti: Add in sysfs links to other coresight devices") Reported-by: Tingwei Zhang <tingwei@codeaurora.org> Signed-off-by: Mike Leach <mike.leach@linaro.org> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200928163513.70169-18-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7b0fc5d281
commit
1cce921bce
@ -494,12 +494,15 @@ static bool cti_add_sysfs_link(struct cti_drvdata *drvdata,
|
||||
return !link_err;
|
||||
}
|
||||
|
||||
static void cti_remove_sysfs_link(struct cti_trig_con *tc)
|
||||
static void cti_remove_sysfs_link(struct cti_drvdata *drvdata,
|
||||
struct cti_trig_con *tc)
|
||||
{
|
||||
struct coresight_sysfs_link link_info;
|
||||
|
||||
link_info.orig = drvdata->csdev;
|
||||
link_info.orig_name = tc->con_dev_name;
|
||||
link_info.target = tc->con_dev;
|
||||
link_info.target_name = dev_name(&drvdata->csdev->dev);
|
||||
coresight_remove_sysfs_link(&link_info);
|
||||
}
|
||||
|
||||
@ -589,7 +592,7 @@ static void cti_remove_assoc_from_csdev(struct coresight_device *csdev)
|
||||
ctidev = &ctidrv->ctidev;
|
||||
list_for_each_entry(tc, &ctidev->trig_cons, node) {
|
||||
if (tc->con_dev == csdev->ect_dev) {
|
||||
cti_remove_sysfs_link(tc);
|
||||
cti_remove_sysfs_link(ctidrv, tc);
|
||||
tc->con_dev = NULL;
|
||||
break;
|
||||
}
|
||||
@ -641,7 +644,7 @@ static void cti_remove_conn_xrefs(struct cti_drvdata *drvdata)
|
||||
if (tc->con_dev) {
|
||||
coresight_set_assoc_ectdev_mutex(tc->con_dev,
|
||||
NULL);
|
||||
cti_remove_sysfs_link(tc);
|
||||
cti_remove_sysfs_link(drvdata, tc);
|
||||
tc->con_dev = NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user