Revert "usb: roles: set switch registered flag early on" This reverts commit 6a902573f2ca7e40fc8714724cf6f0aff0fbb57f which is commit 634775a752a86784511018a108f3b530cc3399a7 upstream. The commit it "fixes" was already reverted due to abi breakages, so this too needs to be reverted in order to fix the build error it causes. Bug: 161946584 Change-Id: I4a4c04ca1b319bc87874e7827287a937b2d7f286 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index 381a918..32e6d19 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c
@@ -345,11 +345,8 @@ usb_role_switch_register(struct device *parent, dev_set_name(&sw->dev, "%s-role-switch", desc->name ? desc->name : dev_name(parent)); - sw->registered = true; - ret = device_register(&sw->dev); if (ret) { - sw->registered = false; put_device(&sw->dev); return ERR_PTR(ret); }