From 2461d9a37e54ce7285a2fe46a1d8a6a27bc079db Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Mar 2025 17:21:34 +0000 Subject: [PATCH] Revert "net: usb: rtl8150: enable basic endpoint checking" This reverts commit 431be4f78220d34ce21d67a6b843b7ca81bd82e9 which is commit 90b7f2961798793275b4844348619b622f983907 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I75c5f4d5fac37cd65f5b947377fbb31fae832656 Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/rtl8150.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 3829b7eb3fc9..cbadb53bac44 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -71,14 +71,6 @@ #define MSR_SPEED (1<<3) #define MSR_LINK (1<<2) -/* USB endpoints */ -enum rtl8150_usb_ep { - RTL8150_USB_EP_CONTROL = 0, - RTL8150_USB_EP_BULK_IN = 1, - RTL8150_USB_EP_BULK_OUT = 2, - RTL8150_USB_EP_INT_IN = 3, -}; - /* Interrupt pipe data */ #define INT_TSR 0x00 #define INT_RSR 0x01 @@ -894,13 +886,6 @@ static int rtl8150_probe(struct usb_interface *intf, struct usb_device *udev = interface_to_usbdev(intf); rtl8150_t *dev; struct net_device *netdev; - static const u8 bulk_ep_addr[] = { - RTL8150_USB_EP_BULK_IN | USB_DIR_IN, - RTL8150_USB_EP_BULK_OUT | USB_DIR_OUT, - 0}; - static const u8 int_ep_addr[] = { - RTL8150_USB_EP_INT_IN | USB_DIR_IN, - 0}; netdev = alloc_etherdev(sizeof(rtl8150_t)); if (!netdev) @@ -914,13 +899,6 @@ static int rtl8150_probe(struct usb_interface *intf, return -ENOMEM; } - /* Verify that all required endpoints are present */ - if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) || - !usb_check_int_endpoints(intf, int_ep_addr)) { - dev_err(&intf->dev, "couldn't find required endpoints\n"); - goto out; - } - tasklet_setup(&dev->tl, rx_fixup); spin_lock_init(&dev->rx_pool_lock);