USB: android: Fix kernel panic during ACM enable
92fe88c8 commit (usb: gadget: Support multiple HSIC transport
instances for dun and rmnet) introduced a sysfs file called
"transport_names" for DUN and RMNET to accept transport names
from user space. The transport names are used for registering
platform drivers. Update ACM function too. Otherwise NULL
string is used to register platform driver and kernel panics.
CRs-Fixed: 479434
Change-Id: I88b56f252f74bcfb2e664a6e37b64fe224739381
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 52ea9e1..6fe4426 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -949,8 +949,24 @@
}
static DEVICE_ATTR(acm_transports, S_IWUSR, NULL, acm_transports_store);
+
+/*enabled ACM transport names - "serial_hsic[,serial_hsusb]"*/
+static char acm_xport_names[32];
+static ssize_t acm_xport_names_store(
+ struct device *device, struct device_attribute *attr,
+ const char *buff, size_t size)
+{
+ strlcpy(acm_xport_names, buff, sizeof(acm_xport_names));
+
+ return size;
+}
+
+static DEVICE_ATTR(acm_transport_names, S_IWUSR, NULL, acm_xport_names_store);
+
static struct device_attribute *acm_function_attributes[] = {
- &dev_attr_acm_transports, NULL };
+ &dev_attr_acm_transports,
+ &dev_attr_acm_transport_names,
+ NULL };
static void acm_function_cleanup(struct android_usb_function *f)
{
@@ -960,8 +976,8 @@
static int acm_function_bind_config(struct android_usb_function *f,
struct usb_configuration *c)
{
- char *name;
- char buf[32], *b;
+ char *name, *xport_name = NULL;
+ char buf[32], *b, xport_name_buf[32], *tb;
int err = -1, i;
static int acm_initialized, ports;
@@ -972,11 +988,16 @@
strlcpy(buf, acm_transports, sizeof(buf));
b = strim(buf);
+ strlcpy(xport_name_buf, acm_xport_names, sizeof(xport_name_buf));
+ tb = strim(xport_name_buf);
+
while (b) {
name = strsep(&b, ",");
if (name) {
- err = acm_init_port(ports, name);
+ if (tb)
+ xport_name = strsep(&tb, ",");
+ err = acm_init_port(ports, name, xport_name);
if (err) {
pr_err("acm: Cannot open port '%s'", name);
goto out;
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index ea6d0bd..e4e81fa 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -986,7 +986,7 @@
/**
* acm_init_port - bind a acm_port to its transport
*/
-static int acm_init_port(int port_num, const char *name)
+static int acm_init_port(int port_num, const char *name, const char *port_name)
{
enum transport_type transport;
@@ -1014,6 +1014,9 @@
no_acm_smd_ports++;
break;
case USB_GADGET_XPORT_HSIC:
+ ghsic_ctrl_set_port_name(port_name, name);
+ ghsic_data_set_port_name(port_name, name);
+
/*client port number will be updated in acm_port_setup*/
no_acm_hsic_sports++;
break;