staging: rtl8188eu: usb_dvobj_init(): A NULL pointer check for usb_host_endpoints...

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: Jes Sorensen <Jes.Sorensen@redhat.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index d3cbcc4a405c01270416c20f07ecdf9945630f5a..bee39c2278f18115935601ad4c985d031c235ce0 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -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,24 +91,22 @@ 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;
-
-               if (phost_endp) {
-                       pendp_desc = &phost_endp->desc;
-                       ep_num = usb_endpoint_num(pendp_desc);
-
-                       if (usb_endpoint_is_bulk_in(pendp_desc)) {
-                               pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = ep_num;
-                               pdvobjpriv->RtNumInPipes++;
-                       } else if (usb_endpoint_is_int_in(pendp_desc)) {
-                               pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = ep_num;
-                               pdvobjpriv->RtNumInPipes++;
-                       } else if (usb_endpoint_is_bulk_out(pendp_desc)) {
-                               pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = ep_num;
-                               pdvobjpriv->RtNumOutPipes++;
-                       }
-                       pdvobjpriv->ep_num[i] = ep_num;
+               pendp_desc = &phost_iface->endpoint[i].desc;
+
+               ep_num = usb_endpoint_num(pendp_desc);
+
+               if (usb_endpoint_is_bulk_in(pendp_desc)) {
+                       pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = ep_num;
+                       pdvobjpriv->RtNumInPipes++;
+               } else if (usb_endpoint_is_int_in(pendp_desc)) {
+                       pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = ep_num;
+                       pdvobjpriv->RtNumInPipes++;
+               } else if (usb_endpoint_is_bulk_out(pendp_desc)) {
+                       pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] =
+                               ep_num;
+                       pdvobjpriv->RtNumOutPipes++;
                }
+               pdvobjpriv->ep_num[i] = ep_num;
        }
 
        if (pusbd->speed == USB_SPEED_HIGH)