diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2014-03-06 13:20:23 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:16 +0900 |
| commit | 4648d43cada6321f5383e7a807b3578847990da4 (patch) | |
| tree | 59507b905ff978df46af9a12d0f5feddc681c3d3 /drivers/usb/gadget | |
| parent | e3f6ac2e129a51267c652104868ba63dc386a6d2 (diff) | |
| download | linux-3.10-4648d43cada6321f5383e7a807b3578847990da4.tar.gz linux-3.10-4648d43cada6321f5383e7a807b3578847990da4.tar.bz2 linux-3.10-4648d43cada6321f5383e7a807b3578847990da4.zip | |
usb: gadget: slp: add an acm instance to default functions
To enable acm function with default configuration, acm function
should be added default function list and instance number should
also be set as at least 1.
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/slp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/slp.c b/drivers/usb/gadget/slp.c index 004680ac378..f4b6d1f804a 100644 --- a/drivers/usb/gadget/slp.c +++ b/drivers/usb/gadget/slp.c @@ -155,7 +155,7 @@ struct slp_multi_dev { }; /* TODO: only enabled 'rndis' and 'sdb'. need to verify more functions */ -static const char * const default_funcs[] = {"rndis", "sdb", "mtp"}; +static const char * const default_funcs[] = {"rndis", "sdb", "mtp", "acm"}; static unsigned slp_multi_nluns; static struct class *slp_multi_class; static struct slp_multi_dev *_slp_multi_dev; @@ -263,6 +263,7 @@ acm_function_init(struct slp_multi_usb_function *f, if (!config) return -ENOMEM; f->config = config; + config->instances = 1; for (i = 0; i < MAX_ACM_INSTANCES; i++) { config->f_acm_inst[i] = usb_get_function_instance("acm"); |