Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/gadget/function/f_fs.c

+4 −4
Original line number Diff line number Diff line
@@ -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);