usb: gadget: rndis: Arrange rndis_reset_response variable
git merge of the upstream v4.8-rc3 on top of the current
rndis.c makes merge command get confused and it does the bad
merge by picking up the both sides of the changes and keeps
the duplicate declaration of xbug and length in-between the code.
It looks like following after merge and we can see that code is
duplicated. Fix this by removing the empty line before the length
variable which does the trick on the git merge.
int rndis_reset_response(...)
{
...
u32 length;
u8 *xbuf;
while(test)
u32 *xbuf;
u8 length;
while(test)
}
Change-Id: I91cdabbb0b0bca72823ce3bafc7ec3ba933bbc48
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
1 file changed