aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2019-04-06 11:53:39 -0700
committerAlistair Strachan <astrachan@google.com>2019-04-06 11:53:41 -0700
commit07797f0ce78953f8527f708fbf79857d3f3ed479 (patch)
tree3bf42b2340f1da3a02a72f10d0ed200dba5767af
parentabe4979abd879af2f4d82e8c0bd46ded3a5ea1dd (diff)
Fix merge issue with 4.4.178ASB-2019-04-05_4.4
Change-Id: I4bd7f3c192046b4e7fc257f03b9cf1fea18e13f7 Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--drivers/usb/gadget/function/rndis.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index 35766fedd556..4dba794a6ad5 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -697,13 +697,6 @@ static int rndis_reset_response(struct rndis_params *params,
while ((xbuf = rndis_get_next_response(params, &length)))
rndis_free_response(params, xbuf);
- u32 length;
- u8 *xbuf;
-
- /* drain the response queue */
- while ((xbuf = rndis_get_next_response(params, &length)))
- rndis_free_response(params, xbuf);
-
r = rndis_add_response(params, sizeof(rndis_reset_cmplt_type));
if (!r)
return -ENOMEM;