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-08 13:09:36 +0000
commitdd33a3be6439b3f1cdb18c8f1c72f0bfbec42c61 (patch)
treeabe63bbcef9ac364ac721fffb430d9ecd52e6ba0
parente2504b51d020421d257335e78f81cb8d3b5ee37c (diff)
Fix merge issue with 4.4.178ASB-2019-04-05_4.4-o
Change-Id: I4bd7f3c192046b4e7fc257f03b9cf1fea18e13f7 Signed-off-by: Alistair Strachan <astrachan@google.com> (cherry picked from commit 07797f0ce78953f8527f708fbf79857d3f3ed479)
-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;