Skip to content

Commit

Permalink
r8152: reduce the control transfer of rtl8152_get_version()
Browse files Browse the repository at this point in the history
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: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Hayes Wang authored and Jakub Kicinski committed Jan 21, 2023
1 parent 95a4c1d commit 0276744
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/usb/r8152.c
Original file line number Diff line number Diff line change
Expand Up @@ -9581,20 +9581,21 @@ static int rtl8152_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(intf);
u8 version = rtl8152_get_version(intf);
struct r8152 *tp;
struct net_device *netdev;
u8 version;
int ret;

if (version == RTL_VER_UNKNOWN)
return -ENODEV;

if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
return -ENODEV;

if (!rtl_check_vendor_ok(intf))
return -ENODEV;

version = rtl8152_get_version(intf);
if (version == RTL_VER_UNKNOWN)
return -ENODEV;

usb_reset_device(udev);
netdev = alloc_etherdev(sizeof(struct r8152));
if (!netdev) {
Expand Down

0 comments on commit 0276744

Please sign in to comment.