Commit 93e97bcf authored by Junxiao Chang's avatar Junxiao Chang Committed by Greg Kroah-Hartman

platform/x86: intel_pmc_ipc: adding error handling

[ Upstream commit e61985d0 ]

If punit or telemetry device initialization fails, pmc driver should
unregister and return failure.

This change is to fix a kernel panic when removing kernel module
intel_pmc_ipc.

Fixes: 48c19170 ("platform:x86: Add Intel telemetry platform device")
Signed-off-by: default avatarJunxiao Chang <junxiao.chang@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent db5d63c1
...@@ -771,13 +771,17 @@ static int ipc_create_pmc_devices(void) ...@@ -771,13 +771,17 @@ static int ipc_create_pmc_devices(void)
if (ret) { if (ret) {
dev_err(ipcdev.dev, "Failed to add punit platform device\n"); dev_err(ipcdev.dev, "Failed to add punit platform device\n");
platform_device_unregister(ipcdev.tco_dev); platform_device_unregister(ipcdev.tco_dev);
return ret;
} }
if (!ipcdev.telem_res_inval) { if (!ipcdev.telem_res_inval) {
ret = ipc_create_telemetry_device(); ret = ipc_create_telemetry_device();
if (ret) if (ret) {
dev_warn(ipcdev.dev, dev_warn(ipcdev.dev,
"Failed to add telemetry platform device\n"); "Failed to add telemetry platform device\n");
platform_device_unregister(ipcdev.punit_dev);
platform_device_unregister(ipcdev.tco_dev);
}
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment