xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remoteproc: core: Fix cdev remove and rproc del

Browse Source 
[ Upstream commit 930eec0be20c93a53160c74005a1485a230e6911 ]

The rproc_char_device_remove() call currently unmaps the cdev
region instead of simply deleting the cdev that was added as a
part of the rproc_char_device_add() call. This change fixes that
behaviour, and also fixes the order in which device_del() and
cdev_del() need to be called.

Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
Link: https://lore.kernel.org/r/1623723671-5517-4-git-send-email-sidgup@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Siddharth Gupta
2021-06-14 19:21:10 -07:00
committed by Greg Kroah-Hartman
parent f3a56cd3ea
commit 2df1abffc4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/remoteproc/remoteproc_cdev.c
View File

@@ -111,7 +111,7 @@ int rproc_char_device_add(struct rproc *rproc)
void rproc_char_device_remove(struct rproc *rproc) void rproc_char_device_remove(struct rproc *rproc)
{ {
__unregister_chrdev(MAJOR(rproc->dev.devt), rproc->index, 1, "remoteproc"); cdev_del(&rproc->cdev);
} }
void __init rproc_init_cdev(void) void __init rproc_init_cdev(void)

2
drivers/remoteproc/remoteproc_core.c
View File

@@ -2290,7 +2290,6 @@ int rproc_del(struct rproc *rproc)
mutex_unlock(&rproc->lock); mutex_unlock(&rproc->lock);
rproc_delete_debug_dir(rproc); rproc_delete_debug_dir(rproc);
rproc_char_device_remove(rproc);
/* the rproc is downref'ed as soon as it's removed from the klist */ /* the rproc is downref'ed as soon as it's removed from the klist */
mutex_lock(&rproc_list_mutex); mutex_lock(&rproc_list_mutex);
@@ -2301,6 +2300,7 @@ int rproc_del(struct rproc *rproc)
synchronize_rcu(); synchronize_rcu();
device_del(&rproc->dev); device_del(&rproc->dev);
rproc_char_device_remove(rproc);
return 0; return 0;
} }