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