evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: gadget: f_hid: use usb_gstrings_attach

Browse source 
Before configfs is integrated the usb_gstrings_attach() interface
must be used.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Andrzej Pietrasiewicz 2014-11-06 11:12:02 +01:00 • committed by Felipe Balbi
parent 5d66a39102
commit 5ca8d3ec99
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/usb/gadget/function/f_hid.c
View file

@ -582,18 +582,17 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
{ {
struct usb_ep *ep; struct usb_ep *ep;
struct f_hidg *hidg = func_to_hidg(f); struct f_hidg *hidg = func_to_hidg(f);
struct usb_string *us;
struct device *device; struct device *device;
int status; int status;
dev_t dev; dev_t dev;
/* maybe allocate device-global string IDs, and patch descriptors */ /* maybe allocate device-global string IDs, and patch descriptors */
if (ct_func_string_defs[CT_FUNC_HID_IDX].id == 0) { us = usb_gstrings_attach(c->cdev, ct_func_strings,
status = usb_string_id(c->cdev); ARRAY_SIZE(ct_func_string_defs));
if (status < 0) if (IS_ERR(us))
return status; return PTR_ERR(us);
ct_func_string_defs[CT_FUNC_HID_IDX].id = status; hidg_interface_desc.iInterface = us[CT_FUNC_HID_IDX].id;
hidg_interface_desc.iInterface = status;
}
/* allocate instance-specific interface IDs, and patch descriptors */ /* allocate instance-specific interface IDs, and patch descriptors */
status = usb_interface_id(c, f); status = usb_interface_id(c, f);
@ -806,7 +805,6 @@ struct usb_function *hidg_alloc(struct usb_function_instance *fi)
} }
hidg->func.name = "hid"; hidg->func.name = "hid";
hidg->func.strings = ct_func_strings;
hidg->func.bind = hidg_bind; hidg->func.bind = hidg_bind;
hidg->func.unbind = hidg_unbind; hidg->func.unbind = hidg_unbind;
hidg->func.set_alt = hidg_set_alt; hidg->func.set_alt = hidg_set_alt;