android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r8152: avoid to change cfg for all devices

Browse Source 
commit 0d4cda805a183bbe523f2407edb5c14ade50b841 upstream.

The rtl8152_cfgselector_probe() should set the USB configuration to the
vendor mode only for the devices which the driver (r8152) supports.
Otherwise, no driver would be used for such devices.

Fixes: ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hayes Wang 2023-01-17 11:03:44 +08:00 committed by Greg Kroah-Hartman
parent 9b3d3a7f3c
commit 1d82735f4b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/usb/r8152.c
View File

@ -9556,9 +9556,8 @@ static int rtl_fw_init(struct r8152 *tp)
return 0;
}
u8 rtl8152_get_version(struct usb_interface *intf)
static u8 __rtl_get_hw_ver(struct usb_device *udev)
{
struct usb_device *udev = interface_to_usbdev(intf);
u32 ocp_data = 0;
__le32 *tmp;
u8 version;
@ -9628,10 +9627,19 @@ u8 rtl8152_get_version(struct usb_interface *intf)
break;
default:
version = RTL_VER_UNKNOWN;
dev_info(&intf->dev, "Unknown version 0x%04x\n", ocp_data);
dev_info(&udev->dev, "Unknown version 0x%04x\n", ocp_data);
break;
}
return version;
}
u8 rtl8152_get_version(struct usb_interface *intf)
{
u8 version;
version = __rtl_get_hw_ver(interface_to_usbdev(intf));
dev_dbg(&intf->dev, "Detected version 0x%04x\n", version);
return version;
@ -9933,6 +9941,12 @@ static int rtl8152_cfgselector_probe(struct usb_device *udev)
struct usb_host_config *c;
int i, num_configs;
/* Switch the device to vendor mode, if and only if the vendor mode
* driver supports it.
*/
if (__rtl_get_hw_ver(udev) == RTL_VER_UNKNOWN)
return 0;
/* The vendor mode is not always config #1, so to find it out. */
c = udev->config;
num_configs = udev->descriptor.bNumConfigurations;