Commit 268200bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'fixes-for-v4.9-rc6' of...

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.
parents f7c4a463 05e78c69
...@@ -3225,11 +3225,11 @@ static bool ffs_func_req_match(struct usb_function *f, ...@@ -3225,11 +3225,11 @@ static bool ffs_func_req_match(struct usb_function *f,
switch (creq->bRequestType & USB_RECIP_MASK) { switch (creq->bRequestType & USB_RECIP_MASK) {
case USB_RECIP_INTERFACE: case USB_RECIP_INTERFACE:
return ffs_func_revmap_intf(func, return (ffs_func_revmap_intf(func,
le16_to_cpu(creq->wIndex) >= 0); le16_to_cpu(creq->wIndex)) >= 0);
case USB_RECIP_ENDPOINT: case USB_RECIP_ENDPOINT:
return ffs_func_revmap_ep(func, return (ffs_func_revmap_ep(func,
le16_to_cpu(creq->wIndex) >= 0); le16_to_cpu(creq->wIndex)) >= 0);
default: default:
return (bool) (func->ffs->user_flags & return (bool) (func->ffs->user_flags &
FUNCTIONFS_ALL_CTRL_RECIP); FUNCTIONFS_ALL_CTRL_RECIP);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment