From: Seung-Woo Kim <sw0312.kim@samsung.com>
Date: Thu, 6 Mar 2014 04:20:23 +0000 (+0900)
Subject: usb: gadget: slp: add an acm instance to default functions
X-Git-Tag: submit/tizen/20141121.110247~428
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4648d43cada6321f5383e7a807b3578847990da4;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

diff --git a/drivers/usb/gadget/slp.c b/drivers/usb/gadget/slp.c
index 004680a..f4b6d1f 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");