From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 17 Aug 2016 15:11:04 +0000 (+0200)
Subject: greybus: es2: fix up usb probe error messages
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=272291008fc55e7692f3219b0f85ee1e6ffdea71;p=linux.git

greybus: es2: fix up usb probe error messages

Properly report which endpoints are being ignored and which ones are
"unknown" to the driver.

Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 6cd3a6411ad3..6cb13fcf62d4 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -1388,6 +1388,7 @@ static int ap_probe(struct usb_interface *interface,
 	struct usb_device *udev;
 	struct usb_host_interface *iface_desc;
 	struct usb_endpoint_descriptor *endpoint;
+	__u8 ep_addr;
 	int retval;
 	int i;
 	int num_cports;
@@ -1435,26 +1436,36 @@ static int ap_probe(struct usb_interface *interface,
 	iface_desc = interface->cur_altsetting;
 	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
 		endpoint = &iface_desc->endpoint[i].desc;
+		ep_addr = endpoint->bEndpointAddress;
 
 		if (usb_endpoint_is_bulk_in(endpoint)) {
 			if (!bulk_in_found) {
-				es2->cport_in.endpoint =
-					endpoint->bEndpointAddress;
+				es2->cport_in.endpoint = ep_addr;
 				bulk_in_found = true;
 			} else if (!arpc_in_found) {
-				es2->arpc_endpoint_in =
-					endpoint->bEndpointAddress;
+				es2->arpc_endpoint_in = ep_addr;
 				arpc_in_found = true;
+			} else {
+				dev_warn(&udev->dev,
+					 "Unused bulk IN endpoint found: 0x%02x\n",
+					 ep_addr);
 			}
-		} else if (usb_endpoint_is_bulk_out(endpoint) &&
-			   (!bulk_out_found)) {
-			es2->cport_out_endpoint = endpoint->bEndpointAddress;
-			bulk_out_found = true;
-		} else {
-			dev_err(&udev->dev,
-				"Unknown endpoint type found, address 0x%02x\n",
-				endpoint->bEndpointAddress);
+			continue;
 		}
+		if (usb_endpoint_is_bulk_out(endpoint)) {
+			if (!bulk_out_found) {
+				es2->cport_out_endpoint = ep_addr;
+				bulk_out_found = true;
+			} else {
+				dev_warn(&udev->dev,
+					 "Unused bulk OUT endpoint found: 0x%02x\n",
+					 ep_addr);
+			}
+			continue;
+		}
+		dev_warn(&udev->dev,
+			 "Unknown endpoint type found, address 0x%02x\n",
+			 ep_addr);
 	}
 	if (!bulk_in_found || !arpc_in_found || !bulk_out_found) {
 		dev_err(&udev->dev, "Not enough endpoints found in device, aborting!\n");