diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-04-02 03:57:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-02 03:57:43 -0700 |
| commit | 6a214b82afd7003b84fbfbd2754693ce294c6be4 (patch) | |
| tree | c3e43b340a504be9492f1d8d21e92b4e9cb02b12 /drivers/usb/gadget/function | |
| parent | 6e016ebde6389f290650d76181d96e4894ff1351 (diff) | |
| parent | 19342ee004a99ae621daba6ae960a243abc7f7ed (diff) | |
Merge "Merge android-4.4.177 (0c3b8c4) into msm-4.4"
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/f_sourcesink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c index 68730e7e8557..77681c43318d 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -847,7 +847,7 @@ static struct usb_function *source_sink_alloc_func( ss = kzalloc(sizeof(*ss), GFP_KERNEL); if (!ss) - return NULL; + return ERR_PTR(-ENOMEM); ss_opts = container_of(fi, struct f_ss_opts, func_inst); |