diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:28:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:28:16 +0200 |
| commit | 97a7729a5c2f01faa076f38a7ec010961b456823 (patch) | |
| tree | d1aaecf81d1357b5920579347e6bb894b4bfe11c /drivers/usb/gadget/f_fs.c | |
| parent | serial: mxs-auart: set the FIFO size to DMA buffer size (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | linux-97a7729a5c2f01faa076f38a7ec010961b456823.tar.xz linux-97a7729a5c2f01faa076f38a7ec010961b456823.zip | |
Merge 3.12-rc4 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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; } /* |