diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-06 19:45:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-06 19:45:55 -0700 |
| commit | f827f291f07cf4c4973e275db59429d540f9fad8 (patch) | |
| tree | 9d82d7bbc7ed5c7ea1dd4071d1b1beca6248ea95 /drivers/usb | |
| parent | 55eaab8b2150cfb890f4b85f23f6e0a53db0003d (diff) | |
| parent | 79cd39543449827667b5633f349a82464edae891 (diff) | |
Merge "usb: gadget: f_mtp: Handle mtp os desc properly"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index aa186781ef22..5e50fe245a59 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -1876,7 +1876,8 @@ struct usb_function *function_alloc_mtp_ptp(struct usb_function_instance *fi, dev->function.disable = mtp_function_disable; dev->function.setup = mtp_ctrlreq_configfs; dev->function.free_func = mtp_free; - dev->is_ptp = mtp_config; + dev->is_ptp = !mtp_config; + fi->f = &dev->function; return &dev->function; } |