diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-15 16:36:51 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-15 16:36:51 -0800 |
| commit | 93e3336909d88c3afca7ccdc8b009c435f37a70a (patch) | |
| tree | 612a96c7d4f38c1912ec053745fe9d2533afb8c1 /drivers/usb/gadget/functions.c | |
| parent | 5577070b6bed1b38916ae65ad51d450774493545 (diff) | |
| parent | 0a60e50f0b910612c3f9560fc3a791e70d146b0b (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'drivers/usb/gadget/functions.c')
| -rw-r--r-- | drivers/usb/gadget/functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/functions.c b/drivers/usb/gadget/functions.c index 389c1f3d0fee..b13f839e7368 100644 --- a/drivers/usb/gadget/functions.c +++ b/drivers/usb/gadget/functions.c @@ -58,7 +58,7 @@ struct usb_function *usb_get_function(struct usb_function_instance *fi) struct usb_function *f; f = fi->fd->alloc_func(fi); - if ((f == NULL) || IS_ERR(f)) + if (IS_ERR(f)) return f; f->fi = fi; return f; |