diff options
| author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2015-05-22 17:25:17 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-05-26 10:15:08 -0500 |
| commit | c41b33c58d11f32e95d06f634ddba0cbf39fc7c6 (patch) | |
| tree | a98ee8a2d4b2363665cd16648adcb016271a9998 | |
| parent | 10f095801cda5cdf24839e2fe90c08cb85a28da6 (diff) | |
| download | linux-stable-c41b33c58d11f32e95d06f634ddba0cbf39fc7c6.tar.gz linux-stable-c41b33c58d11f32e95d06f634ddba0cbf39fc7c6.tar.bz2 linux-stable-c41b33c58d11f32e95d06f634ddba0cbf39fc7c6.zip | |
usb: gadget: g_ffs: Fix counting of missing_functions
Returning non-zero value from ready callback makes ffs instance
return error from writing strings and enter FFS_CLOSING state.
This means that this this function is not truly ready and
close callback will not be called. This commit fix
ffs_ready_callback() to undo all side effects of this function
in case of error.
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/legacy/g_ffs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c index 7b9ef7e257d2..e821931c965c 100644 --- a/drivers/usb/gadget/legacy/g_ffs.c +++ b/drivers/usb/gadget/legacy/g_ffs.c @@ -304,8 +304,10 @@ static int functionfs_ready_callback(struct ffs_data *ffs) gfs_registered = true; ret = usb_composite_probe(&gfs_driver); - if (unlikely(ret < 0)) + if (unlikely(ret < 0)) { + ++missing_funcs; gfs_registered = false; + } return ret; } |