| commit | d370c69a5e2717e9c8ed64ce0546e2421e4338b4 | [log] [tgz] |
|---|---|---|
| author | Kyle Yan <kyan@quicinc.com> | Fri Feb 10 10:18:14 2017 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Feb 10 10:18:14 2017 -0800 |
| tree | 935d4413e62ef8abcce239d9eb98c57e0afbf039 | |
| parent | 174d6ba63afbcd65e8ef33706d5d715bce4130b7 [diff] | |
| parent | ac9d7c8b8a3faf65ab7019dd4aae59862e521cbf [diff] |
Merge "usb: gadget: f_mtp: Handle mtp os desc properly" into msm-4.8
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 13f8bb5..f848082 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c
@@ -1827,6 +1827,7 @@ dev->function.disable = mtp_function_disable; dev->function.setup = mtp_ctrlreq_configfs; dev->function.free_func = mtp_free; + fi->f = &dev->function; return &dev->function; }