| Message ID | 20240308075206.33553-436-nic_swsd@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46590b545df636aea0f9f7f2100d9963c0af5824 |
| Headers | show |
| Series | [net] r8152: fix unknown device for choose_configuration | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 8 Mar 2024 15:52:06 +0800 you wrote: > For the unknown device, rtl8152_cfgselector_choose_configuration() > should return a negative value. Then, usb_choose_configuration() would > set a configuration for CDC ECM or NCM mode. Otherwise, there is no > usb interface driver for the device. > > Fixes: aa4f2b3e418e ("r8152: Choose our USB config with choose_configuration() rather than probe()") > Signed-off-by: Hayes Wang <hayeswang@realtek.com> > > [...] Here is the summary with links: - [net] r8152: fix unknown device for choose_configuration https://git.kernel.org/netdev/net/c/46590b545df6 You are awesome, thank you!
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0d0672d2a654..51fe00c2b896 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -10078,7 +10078,7 @@ static int rtl8152_cfgselector_choose_configuration(struct usb_device *udev) * driver supports it. */ if (__rtl_get_hw_ver(udev) == RTL_VER_UNKNOWN) - return 0; + return -ENODEV; /* The vendor mode is not always config #1, so to find it out. */ c = udev->config;
For the unknown device, rtl8152_cfgselector_choose_configuration() should return a negative value. Then, usb_choose_configuration() would set a configuration for CDC ECM or NCM mode. Otherwise, there is no usb interface driver for the device. Fixes: aa4f2b3e418e ("r8152: Choose our USB config with choose_configuration() rather than probe()") Signed-off-by: Hayes Wang <hayeswang@realtek.com> --- drivers/net/usb/r8152.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)