Commit 02767440 authored by Hayes Wang's avatar Hayes Wang Committed by Jakub Kicinski

r8152: reduce the control transfer of rtl8152_get_version()

Reduce the control transfer by moving calling rtl8152_get_version() in
rtl8152_probe(). This could prevent from calling rtl8152_get_version()
for unnecessary situations. For example, after setting config #2 for the
device, there are two interfaces and rtl8152_probe() may be called
twice. However, we don't need to call rtl8152_get_version() for this
situation.
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 95a4c1d6
...@@ -9581,20 +9581,21 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -9581,20 +9581,21 @@ static int rtl8152_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
u8 version = rtl8152_get_version(intf);
struct r8152 *tp; struct r8152 *tp;
struct net_device *netdev; struct net_device *netdev;
u8 version;
int ret; int ret;
if (version == RTL_VER_UNKNOWN)
return -ENODEV;
if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC) if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
return -ENODEV; return -ENODEV;
if (!rtl_check_vendor_ok(intf)) if (!rtl_check_vendor_ok(intf))
return -ENODEV; return -ENODEV;
version = rtl8152_get_version(intf);
if (version == RTL_VER_UNKNOWN)
return -ENODEV;
usb_reset_device(udev); usb_reset_device(udev);
netdev = alloc_etherdev(sizeof(struct r8152)); netdev = alloc_etherdev(sizeof(struct r8152));
if (!netdev) { if (!netdev) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment