Commit 6179ed59 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: usb_dvobj_init(): A NULL pointer check for usb_host_endpoints makes no sense



struct usb_host_interface points to an array of
struct usb_host_endpoints - it makes no sense to do a NULL pointer
check for each pointer.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b21696c
Loading
Loading
Loading
Loading
+15 −18
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
	struct usb_config_descriptor	*pconf_desc;
	struct usb_host_interface	*phost_iface;
	struct usb_interface_descriptor	*piface_desc;
	struct usb_host_endpoint	*phost_endp;
	struct usb_endpoint_descriptor	*pendp_desc;
	struct usb_device	*pusbd;

@@ -92,10 +91,8 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)

	for (i = 0; i < pdvobjpriv->nr_endpoint; i++) {
		int ep_num;
		phost_endp = phost_iface->endpoint + i;
		pendp_desc = &phost_iface->endpoint[i].desc;

		if (phost_endp) {
			pendp_desc = &phost_endp->desc;
		ep_num = usb_endpoint_num(pendp_desc);

		if (usb_endpoint_is_bulk_in(pendp_desc)) {
@@ -105,12 +102,12 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
			pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = ep_num;
			pdvobjpriv->RtNumInPipes++;
		} else if (usb_endpoint_is_bulk_out(pendp_desc)) {
				pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = ep_num;
			pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] =
				ep_num;
			pdvobjpriv->RtNumOutPipes++;
		}
		pdvobjpriv->ep_num[i] = ep_num;
	}
	}

	if (pusbd->speed == USB_SPEED_HIGH)
		pdvobjpriv->ishighspeed = true;