samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: dsi: check for null pointer during debugfs deinit"

Browse Source
This commit is contained in:
qctecmdr
2021-05-19 09:23:00 -07:00
committed by Gerrit - the friendly Code Review server
parent 98ba50ccf2 6c16356706
commit 1961183b41
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
msm/dsi/dsi_ctrl.c
View File

@@ -333,6 +333,8 @@ static int dsi_ctrl_debugfs_init(struct dsi_ctrl *dsi_ctrl,
dsi_ctrl->debugfs_root = dir; dsi_ctrl->debugfs_root = dir;
return rc;
error_remove_dir: error_remove_dir:
debugfs_remove(dir); debugfs_remove(dir);
error: error:
@@ -341,7 +343,10 @@ error:
static int dsi_ctrl_debugfs_deinit(struct dsi_ctrl *dsi_ctrl) static int dsi_ctrl_debugfs_deinit(struct dsi_ctrl *dsi_ctrl)
{ {
if (dsi_ctrl->debugfs_root) {
debugfs_remove(dsi_ctrl->debugfs_root); debugfs_remove(dsi_ctrl->debugfs_root);
dsi_ctrl->debugfs_root = NULL;
}
return 0; return 0;
} }
#else #else

3
msm/dsi/dsi_display.c
View File

@@ -2097,7 +2097,10 @@ error:
static int dsi_display_debugfs_deinit(struct dsi_display *display) static int dsi_display_debugfs_deinit(struct dsi_display *display)
{ {
if (display->root) {
debugfs_remove_recursive(display->root); debugfs_remove_recursive(display->root);
display->root = NULL;
}
return 0; return 0;
} }