Merge branch 'for-next' into for-linus

[linux-2.6-microblaze.git] / sound / usb / quirks.c

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index fca7273..c551141 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1144,14 +1144,14 @@ static int snd_usb_motu_m_series_boot_quirk(struct usb_device *dev)
 #define MAUDIO_SET             0x01 /* parse device_setup */
 #define MAUDIO_SET_COMPATIBLE  0x80 /* use only "win-compatible" interfaces */
 #define MAUDIO_SET_DTS         0x02 /* enable DTS Digital Output */
-#define MAUDIO_SET_96K         0x04 /* 48-96KHz rate if set, 8-48KHz otherwise */
+#define MAUDIO_SET_96K         0x04 /* 48-96kHz rate if set, 8-48kHz otherwise */
 #define MAUDIO_SET_24B         0x08 /* 24bits sample if set, 16bits otherwise */
 #define MAUDIO_SET_DI          0x10 /* enable Digital Input */
 #define MAUDIO_SET_MASK                0x1f /* bit mask for setup value */
-#define MAUDIO_SET_24B_48K_DI   0x19 /* 24bits+48KHz+Digital Input */
-#define MAUDIO_SET_24B_48K_NOTDI 0x09 /* 24bits+48KHz+No Digital Input */
-#define MAUDIO_SET_16B_48K_DI   0x11 /* 16bits+48KHz+Digital Input */
-#define MAUDIO_SET_16B_48K_NOTDI 0x01 /* 16bits+48KHz+No Digital Input */
+#define MAUDIO_SET_24B_48K_DI   0x19 /* 24bits+48kHz+Digital Input */
+#define MAUDIO_SET_24B_48K_NOTDI 0x09 /* 24bits+48kHz+No Digital Input */
+#define MAUDIO_SET_16B_48K_DI   0x11 /* 16bits+48kHz+Digital Input */
+#define MAUDIO_SET_16B_48K_NOTDI 0x01 /* 16bits+48kHz+No Digital Input */
 
 static int quattro_skip_setting_quirk(struct snd_usb_audio *chip,
                                      int iface, int altno)
@@ -1597,7 +1597,7 @@ void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep)
 
        /*
         * M-Audio Fast Track C400/C600 - when packets are not skipped, real
-        * world latency varies by approx. +/- 50 frames (at 96KHz) each time
+        * world latency varies by approx. +/- 50 frames (at 96kHz) each time
         * the stream is (re)started. When skipping packets 16 at endpoint
         * start up, the real world latency is stable within +/- 1 frame (also
         * across power cycles).
@@ -1839,7 +1839,7 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
                /*
                 * MaxPacketsOnly attribute is erroneously set in endpoint
                 * descriptors. As a result this card produces noise with
-                * all sample rates other than 96 KHz.
+                * all sample rates other than 96 kHz.
                 */
                fp->attributes &= ~UAC_EP_CS_ATTR_FILL_MAX;
                break;