summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-02-15 16:26:41 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-02-15 16:26:41 +0900
commitd60cf53a30956e47919788b2ef49287786a959c9 (patch)
treecb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /sound/usb/mixer.c
parent0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff)
parent13c12a4e8ecdf3998cd2d89ade69f6f194819c95 (diff)
downloadtalos-op-linux-d60cf53a30956e47919788b2ef49287786a959c9.tar.gz
talos-op-linux-d60cf53a30956e47919788b2ef49287786a959c9.zip
Merge branch 'sh/st-integration' into sh/urgent
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 7df89b3d7ded..85af6051b52d 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -95,7 +95,7 @@ enum {
};
-/*E-mu 0202(0404) eXtension Unit(XU) control*/
+/*E-mu 0202/0404/0204 eXtension Unit(XU) control*/
enum {
USB_XU_CLOCK_RATE = 0xe301,
USB_XU_CLOCK_SOURCE = 0xe302,
@@ -1566,7 +1566,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
cval->initialized = 1;
} else {
if (type == USB_XU_CLOCK_RATE) {
- /* E-Mu USB 0404/0202/TrackerPre
+ /* E-Mu USB 0404/0202/TrackerPre/0204
* samplerate control quirk
*/
cval->min = 0;
OpenPOWER on IntegriCloud