Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336102ed authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Amit Pundir
Browse files

usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8 



Change-Id: I332a6802dbd49b4018b9318b8621d26ed94c955d
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
parent f36b1f40

drivers/usb/gadget/f_accessory.c

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int acc_bind_config(struct usb_configuration *c) 
	dev->cdev = c->cdev;

	dev->function.name = "accessory";

	dev->function.strings = acc_strings,

	dev->function.descriptors = fs_acc_descs;

	dev->function.fs_descriptors = fs_acc_descs;

	dev->function.hs_descriptors = hs_acc_descs;

	dev->function.bind = acc_function_bind;

	dev->function.unbind = acc_function_unbind;

drivers/usb/gadget/f_adb.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static int adb_bind_config(struct usb_configuration *c) 


	dev->cdev = c->cdev;

	dev->function.name = "adb";

	dev->function.descriptors = fs_adb_descs;

	dev->function.fs_descriptors = fs_adb_descs;

	dev->function.hs_descriptors = hs_adb_descs;

	dev->function.bind = adb_function_bind;

	dev->function.unbind = adb_function_unbind;

drivers/usb/gadget/f_audio_source.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ audio_bind(struct usb_configuration *c, struct usb_function *f) 
		hs_as_in_ep_desc.bEndpointAddress =

			fs_as_in_ep_desc.bEndpointAddress;



	f->descriptors = fs_audio_desc;

	f->fs_descriptors = fs_audio_desc;

	f->hs_descriptors = hs_audio_desc;



	for (i = 0, status = 0; i < IN_EP_REQ_COUNT && status == 0; i++) {

drivers/usb/gadget/f_mtp.c

+2 −2
Original line number Diff line number Diff line
@@ -1212,10 +1212,10 @@ static int mtp_bind_config(struct usb_configuration *c, bool ptp_config) 
	dev->function.name = "mtp";

	dev->function.strings = mtp_strings;

	if (ptp_config) {

		dev->function.descriptors = fs_ptp_descs;

		dev->function.fs_descriptors = fs_ptp_descs;

		dev->function.hs_descriptors = hs_ptp_descs;

	} else {

		dev->function.descriptors = fs_mtp_descs;

		dev->function.fs_descriptors = fs_mtp_descs;

		dev->function.hs_descriptors = hs_mtp_descs;

	}

	dev->function.bind = mtp_function_bind;