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/function/f_mtp.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/function/f_mtp.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 74195be9b054..b9e3e97c57c4 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -1498,7 +1498,7 @@ struct usb_function *function_alloc_mtp_ptp(struct usb_function_instance *fi, pr_err("\t2: Create MTP function\n"); pr_err("\t3: Create and symlink PTP function" " with a gadget configuration\n"); - return NULL; + return ERR_PTR(-EINVAL); /* Invalid Configuration */ } dev = fi_mtp->dev; |