mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-12 11:12:35 -05:00
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.
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user