diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-18 15:43:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-18 15:43:49 +0300 |
| commit | 268200bcafe4741db27667a42e5165a02800fb02 (patch) | |
| tree | 5b6a43abf9b792358450a3df4ef39c9bf2e292b0 | |
| parent | f7c4a46352b58c04e4d2111df7fe0358ce84546d (diff) | |
| parent | 05e78c6933d613a7da0d0473f4c19c865af04c2c (diff) | |
| download | linux-268200bcafe4741db27667a42e5165a02800fb02.tar.xz | |
Merge tag 'fixes-for-v4.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.9-rc5
One single fix for FunctionFS to make sure we're checking
ffs_func_req_match()'s return code correctly.
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index e40d47d47d82..17989b72cdae 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -3225,11 +3225,11 @@ static bool ffs_func_req_match(struct usb_function *f, switch (creq->bRequestType & USB_RECIP_MASK) { case USB_RECIP_INTERFACE: - return ffs_func_revmap_intf(func, - le16_to_cpu(creq->wIndex) >= 0); + return (ffs_func_revmap_intf(func, + le16_to_cpu(creq->wIndex)) >= 0); case USB_RECIP_ENDPOINT: - return ffs_func_revmap_ep(func, - le16_to_cpu(creq->wIndex) >= 0); + return (ffs_func_revmap_ep(func, + le16_to_cpu(creq->wIndex)) >= 0); default: return (bool) (func->ffs->user_flags & FUNCTIONFS_ALL_CTRL_RECIP); |