openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB hub_probe: rework ugly goto-into-compound-statement 

Rework smelling code (goto inside compound statement). Perhaps this is
legacy. Anyway such code is not appropriate for Linux kernel.

Signed-off-by: Eugene Korenevsky <ekorenevsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eugene Korenevsky 2017-06-25 11:08:14 +03:00 committed by Greg Kroah-Hartman
parent af06d0094f
commit c94dc34f77
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/usb/core/hub.c
View File

@ -1661,10 +1661,28 @@ static void hub_disconnect(struct usb_interface *intf)
kref_put(&hub->kref, hub_release); kref_put(&hub->kref, hub_release);
} }
static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
{
/* Some hubs have a subclass of 1, which AFAICT according to the */
/* specs is not defined, but it works */
if (desc->desc.bInterfaceSubClass != 0 &&
desc->desc.bInterfaceSubClass != 1)
return false;
/* Multiple endpoints? What kind of mutant ninja-hub is this? */
if (desc->desc.bNumEndpoints != 1)
return false;
/* If the first endpoint is not interrupt IN, we'd better punt! */
if (!usb_endpoint_is_int_in(&desc->endpoint[0].desc))
return false;
return true;
}
static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
{ {
struct usb_host_interface *desc; struct usb_host_interface *desc;
struct usb_endpoint_descriptor *endpoint;
struct usb_device *hdev; struct usb_device *hdev;
struct usb_hub *hub; struct usb_hub *hub;
@ -1739,25 +1757,11 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
} }
#endif #endif
/* Some hubs have a subclass of 1, which AFAICT according to the */ if (!hub_descriptor_is_sane(desc)) {
/* specs is not defined, but it works */
if ((desc->desc.bInterfaceSubClass != 0) &&
(desc->desc.bInterfaceSubClass != 1)) {
descriptor_error:
dev_err(&intf->dev, "bad descriptor, ignoring hub\n"); dev_err(&intf->dev, "bad descriptor, ignoring hub\n");
return -EIO; return -EIO;
} }
/* Multiple endpoints? What kind of mutant ninja-hub is this? */
if (desc->desc.bNumEndpoints != 1)
goto descriptor_error;
endpoint = &desc->endpoint[0].desc;
/* If it's not an interrupt in endpoint, we'd better punt! */
if (!usb_endpoint_is_int_in(endpoint))
goto descriptor_error;
/* We found a hub */ /* We found a hub */
dev_info(&intf->dev, "USB hub found\n"); dev_info(&intf->dev, "USB hub found\n");
@ -1784,7 +1788,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND) if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
hub->quirk_check_port_auto_suspend = 1; hub->quirk_check_port_auto_suspend = 1;
if (hub_configure(hub, endpoint) >= 0) if (hub_configure(hub, &desc->endpoint[0].desc) >= 0)
return 0; return 0;
hub_disconnect(intf); hub_disconnect(intf);