diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 15:59:01 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 15:59:01 -0400 |
| commit | f72222c74bd642182cc892c99df65cb105c61193 (patch) | |
| tree | 3e35484b289f6dec19a73d5e56dcbcba846af032 /sound/usb/usbmixer.c | |
| parent | 318b0b8d90326aee6a66c994432eee95c0a9aaea (diff) | |
| parent | d3c9e9a1390f8a34da8b69e09fa1afa90f5067f4 (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711
Diffstat (limited to 'sound/usb/usbmixer.c')
| -rw-r--r-- | sound/usb/usbmixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index ecb58e7a6245..4bd3a7a0edc1 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
| @@ -423,7 +423,7 @@ static int set_ctl_value(struct usb_mixer_elem_info *cval, int request, int vali | |||
| 423 | value_set = convert_bytes_value(cval, value_set); | 423 | value_set = convert_bytes_value(cval, value_set); |
| 424 | buf[0] = value_set & 0xff; | 424 | buf[0] = value_set & 0xff; |
| 425 | buf[1] = (value_set >> 8) & 0xff; | 425 | buf[1] = (value_set >> 8) & 0xff; |
| 426 | while (timeout -- > 0) | 426 | while (timeout-- > 0) |
| 427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, | 427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, |
| 428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), | 428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), |
| 429 | request, | 429 | request, |