The r8152 interface driver is preferred over the generic
class driver because it provides more features. Hence
we now have a device driver that switches the configuration.
That device driver is sensible only if an interface driver
for the selected configuration exists.
However, the initialization for this module first reisters
the device driver and after that the interface driver.
That screws up error handling. Both registrations return
error codes. That means that the registration of the
device driver can currently work, but the interface
driver can fail.
In that case we switch the devices to a configuration
we have no driver for. That must not happen. The easiest
fix is to register the interface driver first and
bail out if that fails. That way if the device driver
fails, nothing needs to be undone.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxxx>
Fixes: ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
---
drivers/net/usb/r8152.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 9bf2140fd0a1..e856ef83cef0 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -10117,10 +10117,13 @@ static int __init rtl8152_driver_init(void)
{
int ret;
- ret = usb_register_device_driver(&rtl8152_cfgselector_driver, THIS_MODULE);
+ ret = usb_register(&rtl8152_driver);
if (ret)
return ret;
- return usb_register(&rtl8152_driver);
+
+ ret = usb_register_device_driver(&rtl8152_cfgselector_driver, THIS_MODULE);
+ return ret;
+
}
static void __exit rtl8152_driver_exit(void)
--
2.43.0
