[PATCH 4.9 043/117] platform/x86: intel_pmc_ipc: adding error handling

[Greg Kroah-Hartman]

[ Upstream commit e61985d0550df8c2078310202aaad9b41049c36c ]

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: 48c1917088ba ("platform:x86: Add Intel telemetry platform device")
Signed-off-by: Junxiao Chang <junxiao.ch...@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/platform/x86/intel_pmc_ipc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel_pmc_ipc.c 
b/drivers/platform/x86/intel_pmc_ipc.c
index 0bf51d574fa9..f2b9dd82128f 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -620,13 +620,17 @@ static int ipc_create_pmc_devices(void)
        if (ret) {
                dev_err(ipcdev.dev, "Failed to add punit platform device\n");
                platform_device_unregister(ipcdev.tco_dev);
+               return ret;
        }
 
        if (!ipcdev.telem_res_inval) {
                ret = ipc_create_telemetry_device();
-               if (ret)
+               if (ret) {
                        dev_warn(ipcdev.dev,
                                "Failed to add telemetry platform device\n");
+                       platform_device_unregister(ipcdev.punit_dev);
+                       platform_device_unregister(ipcdev.tco_dev);
+               }
        }
 
        return ret;
-- 
2.20.1