patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / usb / usbmixer.c

diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index afbf51f..a17d3f8 100644 (file)
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -301,7 +301,7 @@ static int get_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, i
        int timeout = 10;
  
        while (timeout-- > 0) {
-               if (usb_control_msg(cval->chip->dev, usb_rcvctrlpipe(cval->chip->dev, 0),
+               if (snd_usb_ctl_msg(cval->chip->dev, usb_rcvctrlpipe(cval->chip->dev, 0),
                                    request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                                    validx, cval->ctrlif | (cval->id << 8),
@@ -339,7 +339,7 @@ static int set_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, i
        buf[0] = value_set & 0xff;
        buf[1] = (value_set >> 8) & 0xff;
        while (timeout -- > 0)
-               if (usb_control_msg(cval->chip->dev, usb_sndctrlpipe(cval->chip->dev, 0),
+               if (snd_usb_ctl_msg(cval->chip->dev, usb_sndctrlpipe(cval->chip->dev, 0),
                                    request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
                                    validx, cval->ctrlif | (cval->id << 8),