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

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

diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index a244265c114348a9568045e72977bc34e46804d2..092964c2b5061aaab5c761327c7b4fb094b1beec 100644 (file)
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -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;

diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c
index 1629ffb5b9799e41a3db2a26c6d9c235098e7424..a1d70d2769539275f5d9b5cf6e0c8be7c20448f6 100644 (file)
--- a/drivers/usb/gadget/f_adb.c
+++ b/drivers/usb/gadget/f_adb.c
@@ -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;

diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c
index c757409edf942f8bd150d210c4da33f9314733d1..56dcf217cfe5647e592304ef94f8cc70890f0243 100644 (file)
--- a/drivers/usb/gadget/f_audio_source.c
+++ b/drivers/usb/gadget/f_audio_source.c
@@ -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++) {

diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 1638977a54105cea6783509d4812b03d0e9f90d5..9ab94697c196313acfe0518e6e5a85be9ba07958 100644 (file)
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -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;