diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-27 21:49:03 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-27 21:49:03 +0400 |
commit | c24cb6c8b501ebdf1aacec7960110a9741a45ced (patch) | |
tree | c0047443cefd958cda28289c8184ad4604ffa5fc /drivers/usb/gadget/f_fs.c | |
parent | 043e3f834530e15e89c58c1b7af59cc646700134 (diff) | |
parent | 2cf93bea3d7b2dbf1e0ebfa9d381aad1b637e2aa (diff) | |
download | linux-c24cb6c8b501ebdf1aacec7960110a9741a45ced.tar.xz |
Merge tag 'fixes-for-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.13-rc2
First set of fixes for this -rc cycle. A few important
fixes which should be backported to stable kernels and
the usual set of sparse warning fixes. There's also a
regression fix on phy-generic.c which would prevent
am335x-based platforms from having their PHY drivers
probed.
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, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 774e8b89cdb5..241fc873ffa4 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -1304,7 +1304,7 @@ static struct ffs_data *ffs_data_new(void) { struct ffs_data *ffs = kzalloc(sizeof *ffs, GFP_KERNEL); if (unlikely(!ffs)) - return 0; + return NULL; ENTER(); |