From 4726098bcc4cf033dd57b6310de46ef3692debf5 Mon Sep 17 00:00:00 2001 From: Vadim Pasternak Date: Wed, 31 Jan 2018 21:55:13 +0000 Subject: [PATCH] platform/x86: mlx-platform: Add hotplug device unregister to error path Add hotplug platform driver un-registration in case regmap cache synchronization failed. In such case hotplug platform driver registration should be rolled back. Signed-off-by: Vadim Pasternak Signed-off-by: Darren Hart (VMware) --- drivers/platform/x86/mlx-platform.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c index 752476e83da4a..dfecba4407ac4 100644 --- a/drivers/platform/x86/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -550,10 +550,12 @@ static int __init mlxplat_init(void) regcache_mark_dirty(mlxplat_hotplug->regmap); err = regcache_sync(mlxplat_hotplug->regmap); if (err) - goto fail_platform_mux_register; + goto fail_platform_hotplug_register; return 0; +fail_platform_hotplug_register: + platform_device_unregister(priv->pdev_hotplug); fail_platform_mux_register: while (--i >= 0) platform_device_unregister(priv->pdev_mux[i]); -- 2.39.2