aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-11 08:48:09 -0500
committerTakashi Iwai <tiwai@suse.de>2011-03-11 08:48:09 -0500
commitcc99a0861fa1c72335dc91a2e06d0b431911d55e (patch)
treeb5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/usb/mixer.c
parentbc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f (diff)
parent382225e62bdb8059b7f915b133426425516dd300 (diff)
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r--sound/usb/mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 844cf786e81c..675a4f1b5de1 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -95,7 +95,7 @@ enum {
95}; 95};
96 96
97 97
98/*E-mu 0202(0404) eXtension Unit(XU) control*/ 98/*E-mu 0202/0404/0204 eXtension Unit(XU) control*/
99enum { 99enum {
100 USB_XU_CLOCK_RATE = 0xe301, 100 USB_XU_CLOCK_RATE = 0xe301,
101 USB_XU_CLOCK_SOURCE = 0xe302, 101 USB_XU_CLOCK_SOURCE = 0xe302,
@@ -1583,7 +1583,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
1583 cval->initialized = 1; 1583 cval->initialized = 1;
1584 } else { 1584 } else {
1585 if (type == USB_XU_CLOCK_RATE) { 1585 if (type == USB_XU_CLOCK_RATE) {
1586 /* E-Mu USB 0404/0202/TrackerPre 1586 /* E-Mu USB 0404/0202/TrackerPre/0204
1587 * samplerate control quirk 1587 * samplerate control quirk
1588 */ 1588 */
1589 cval->min = 0; 1589 cval->min = 0;