From 28d644750bac6f03ae44ceb40b664646aab061cc Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 13 May 2011 16:53:48 +0300 Subject: [PATCH] --- yaml --- r: 248868 b: refs/heads/master c: 472b91274a6c6857877b5caddb875dcb5ecdfcb8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_rndis.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f01fe90ede04..88a829992bd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf1f0a05d472e33dda8e5e69525be1584cdbd03a +refs/heads/master: 472b91274a6c6857877b5caddb875dcb5ecdfcb8 diff --git a/trunk/drivers/usb/gadget/f_rndis.c b/trunk/drivers/usb/gadget/f_rndis.c index 882484a40398..fa12ec8364ef 100644 --- a/trunk/drivers/usb/gadget/f_rndis.c +++ b/trunk/drivers/usb/gadget/f_rndis.c @@ -420,8 +420,7 @@ rndis_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) */ case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | USB_CDC_SEND_ENCAPSULATED_COMMAND: - if (w_length > req->length || w_value - || w_index != rndis->ctrl_id) + if (w_value || w_index != rndis->ctrl_id) goto invalid; /* read the request; process it later */ value = w_length;