usb: typec: Add the missed altmode_id_remove() in typec_register_altmode()

BugLink: https://bugs.launchpad.net/bugs/1938340
commit 03026197bb657d784220b040c6173267a0375741 upstream.

typec_register_altmode() misses to call altmode_id_remove() in an error
path. Add the missed function call to fix it.

Fixes: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes")
Cc: stable <stable@vger.kernel.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Link: https://lore.kernel.org/r/20210617073226.47599-1-jingxiangfeng@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 8f77669f9cf4fad37ff036c922eb6d7a524b7ddf..36d944d4540fd51e59ba061b58417f24e8965f08 100644 (file)
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -564,8 +564,10 @@ typec_register_altmode(struct device *parent,
        int ret;
 
        alt = kzalloc(sizeof(*alt), GFP_KERNEL);
-       if (!alt)
+       if (!alt) {
+               altmode_id_remove(parent, id);
                return ERR_PTR(-ENOMEM);
+       }
 
        alt->adev.svid = desc->svid;
        alt->adev.mode = desc->mode;