diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 63715cdfe9888d4e19669ea65e2026f425629f1a..54dc00b7b9f682242b2cd70bb266c4f2054fb4c6 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -570,6 +570,10 @@ static void extcon_cleanup(struct extcon_dev *edev, bool skip)
 			kfree(edev->cables);
 		}
 
+#if defined(CONFIG_ANDROID)
+		if (switch_class)
+			class_compat_remove_link(switch_class, edev->dev, NULL);
+#endif
 		device_unregister(edev->dev);
 		put_device(edev->dev);
 	}