From a251a379adb586ce42471f72dbdfd824148a8be2 Mon Sep 17 00:00:00 2001 From: Srinivas Pandruvada Date: Sat, 11 Sep 2021 12:13:54 +0800 Subject: [PATCH] Intel: ICX: platform/x86: ISST: Fix wrong unregister type mainline inclusion from mainline-v5.7-rc1 commit 6cc8f6598978b8f30e70bc12f28fbbc9e26227cc category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V CVE: NA -------------------------------- commit 6cc8f6598978b8f30e70bc12f28fbbc9e26227cc upstream Backport summary: Backport to kernel 4.19.57 to support ICX ISST The MMIO driver is not unregistering with the correct type with the ISST common core during module removal. This should be unregistered with ISST_IF_DEV_MMIO instead of ISST_IF_DEV_MBOX. Signed-off-by: Srinivas Pandruvada Signed-off-by: Andy Shevchenko Signed-off-by: Youquan Song Signed-off-by: Jackie Liu Signed-off-by: Zheng Zengkai Reviewed-by: Hanjun Guo Reviewed-by: Xie XiuQi Signed-off-by: Yang Yingliang --- drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c index f7266a115a08..bd3b867a4958 100644 --- a/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c +++ b/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c @@ -126,7 +126,7 @@ static void isst_if_remove(struct pci_dev *pdev) struct isst_if_device *punit_dev; punit_dev = pci_get_drvdata(pdev); - isst_if_cdev_unregister(ISST_IF_DEV_MBOX); + isst_if_cdev_unregister(ISST_IF_DEV_MMIO); mutex_destroy(&punit_dev->mutex); } -- GitLab