[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <d108e379-da94-42a6-a60d-eba2f9531c1d@lunn.ch>
Date: Thu, 9 Oct 2025 14:01:40 +0200
From: Andrew Lunn <andrew@...n.ch>
To: yicongsrfy@....com
Cc: andrew+netdev@...n.ch, davem@...emloft.net, edumazet@...gle.com,
oneukum@...e.com, kuba@...nel.org, linux-usb@...r.kernel.org,
netdev@...r.kernel.org, yicong@...inos.cn
Subject: Re: [PATCH] net: usb: r8152: add error handling in
rtl8152_driver_init
On Thu, Oct 09, 2025 at 03:58:33PM +0800, yicongsrfy@....com wrote:
> From: Yi Cong <yicong@...inos.cn>
>
> rtl8152_driver_init missing error handling.
> If cannot register rtl8152_driver, rtl8152_cfgselector_driver
> should be deregistered.
>
> Fixes: ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
> Signed-off-by: Yi Cong <yicong@...inos.cn>
> ---
> drivers/net/usb/r8152.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index 44cba7acfe7d..a64bcb744fad 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -10122,7 +10122,14 @@ static int __init rtl8152_driver_init(void)
> ret = usb_register_device_driver(&rtl8152_cfgselector_driver, THIS_MODULE);
> if (ret)
> return ret;
> - return usb_register(&rtl8152_driver);
> +
> + ret = usb_register(&rtl8152_driver);
> + if (ret) {
> + usb_deregister_device_driver(&rtl8152_cfgselector_driver);
> + return ret;
> + }
> +
> + return 0;
> }
You can make this slightly simpler by replacing return 0; with
return ret;
Andrew
---
pw-bot: cr
Powered by blists - more mailing lists