From 1759549b7c16e0bc47b821ca788a1462448db495 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 10:38:59 +0000 Subject: [PATCH] staging: vc_sm_cma: Remove erroneous misc_deregister Code from the misc /dev node was still present in bcm2835_vc_sm_cma_remove, which caused a NULL deref. Remove it. See #2885. Signed-off-by: Dave Stevenson --- drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c index 7ac6b80..4bc738a 100644 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -72,7 +71,6 @@ struct sm_pde_t { struct sm_state_t { struct platform_device *pdev; - struct miscdevice dev; struct sm_instance *sm_handle; /* Handle for videocore service. */ spinlock_t kernelid_map_lock; /* Spinlock protecting kernelid_map */ @@ -758,9 +756,6 @@ static int bcm2835_vc_sm_cma_remove(struct platform_device *pdev) { pr_debug("[%s]: start\n", __func__); if (sm_inited) { - /* Remove shared memory device. */ - misc_deregister(&sm_state->dev); - /* Remove all proc entries. */ //debugfs_remove_recursive(sm_state->dir_root); -- 2.7.4