diff options
| author | Greg Kroah-Hartman | 2013-10-01 23:22:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-10-01 23:22:05 +0200 |
| commit | bdd78f22ffc86883bfc04586cbe177281d7e8d81 (patch) | |
| tree | 8092247775d9ecfb3b1086b069b700948d0d53b9 /drivers/usb/gadget/f_fs.c | |
| parent | USB: serial: option: Ignore card reader interface on Huawei E1750 (diff) | |
| parent | usb: gadget: s3c-hsotg: fix can_write limit for non-periodic endpoints (diff) | |
| download | kernel-qcow2-linux-bdd78f22ffc86883bfc04586cbe177281d7e8d81.tar.gz kernel-qcow2-linux-bdd78f22ffc86883bfc04586cbe177281d7e8d81.tar.xz kernel-qcow2-linux-bdd78f22ffc86883bfc04586cbe177281d7e8d81.zip | |
Merge tag 'fixes-for-v3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.12-rc4
Here are some more fixes to musb's OTG support and a regression
caused on latest merge window; pxa25x_udc and gpio-vbus learned
to cope with deferred probe; s3c-hsotg got a fix for non-periodic
endpoints write size and f_fs got an error handling fix for cases
where ffs_do_descs() fail.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 0658908d8968..44cf775a8627 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -2256,6 +2256,8 @@ static int ffs_func_bind(struct usb_configuration *c, data->raw_descs + ret, (sizeof data->raw_descs) - ret, __ffs_func_bind_do_descs, func); + if (unlikely(ret < 0)) + goto error; } /* |