Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / drivers / usb / gadget / audio.c

diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c
index 94de7e864614961f322412d2855289041fdda22e..a3a0f4a27ef0d9edea1720aba630050ab9abd7ab 100644 (file)
--- a/drivers/usb/gadget/audio.c
+++ b/drivers/usb/gadget/audio.c
@@ -42,9 +42,9 @@
  * Instead:  allocate your own, using normal USB-IF procedures.
  */
 
-/* Thanks to NetChip Technologies for donating this product ID. */
-#define AUDIO_VENDOR_NUM               0x0525  /* NetChip */
-#define AUDIO_PRODUCT_NUM              0xa4a1  /* Linux-USB Audio Gadget */
+/* Thanks to Linux Foundation for donating this product ID. */
+#define AUDIO_VENDOR_NUM               0x1d6b  /* Linux Foundation */
+#define AUDIO_PRODUCT_NUM              0x0101  /* Linux-USB Audio Gadget */
 
 /*-------------------------------------------------------------------------*/
 
@@ -106,20 +106,20 @@ static int audio_set_endpoint_req(struct usb_configuration *c,
                        ctrl->bRequest, w_value, len, ep);
 
        switch (ctrl->bRequest) {
-       case SET_CUR:
+       case UAC_SET_CUR:
                value = 0;
                break;
 
-       case SET_MIN:
+       case UAC_SET_MIN:
                break;
 
-       case SET_MAX:
+       case UAC_SET_MAX:
                break;
 
-       case SET_RES:
+       case UAC_SET_RES:
                break;
 
-       case SET_MEM:
+       case UAC_SET_MEM:
                break;
 
        default:
@@ -142,13 +142,13 @@ static int audio_get_endpoint_req(struct usb_configuration *c,
                        ctrl->bRequest, w_value, len, ep);
 
        switch (ctrl->bRequest) {
-       case GET_CUR:
-       case GET_MIN:
-       case GET_MAX:
-       case GET_RES:
+       case UAC_GET_CUR:
+       case UAC_GET_MIN:
+       case UAC_GET_MAX:
+       case UAC_GET_RES:
                value = 3;
                break;
-       case GET_MEM:
+       case UAC_GET_MEM:
                break;
        default:
                break;
@@ -171,11 +171,11 @@ audio_setup(struct usb_configuration *c, const struct usb_ctrlrequest *ctrl)
         * Audio class messages; interface activation uses set_alt().
         */
        switch (ctrl->bRequestType) {
-       case USB_AUDIO_SET_ENDPOINT:
+       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                value = audio_set_endpoint_req(c, ctrl);
                break;
 
-       case USB_AUDIO_GET_ENDPOINT:
+       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                value = audio_get_endpoint_req(c, ctrl);
                break;