diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
commit | a66f9577c6e5280d83d45152aea29cf5e4548858 (patch) | |
tree | ebb42fa6ef16a535adbd5acb8cc79bdd2980da24 /drivers/usb/gadget | |
parent | 26700159745df7db2bc75e8032d2a36913c37880 (diff) | |
parent | 2308e34317c8cc7beb03a3d18dc39d32015eff06 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/udc/fsl_qe_udc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c index c73689b72f95..b38a33584d4a 100644 --- a/drivers/usb/gadget/udc/fsl_qe_udc.c +++ b/drivers/usb/gadget/udc/fsl_qe_udc.c @@ -1878,11 +1878,8 @@ static int qe_get_frame(struct usb_gadget *gadget) tmp = in_be16(&udc->usb_param->frame_n); if (tmp & 0x8000) - tmp = tmp & 0x07ff; - else - tmp = -EINVAL; - - return (int)tmp; + return tmp & 0x07ff; + return -EINVAL; } static int fsl_qe_start(struct usb_gadget *gadget, |