Merge branch 'drm-3.17-rc2-sti-fixes' of git://git.linaro.org/people/benjamin.gaignar...

[karo-tx-linux.git] / sound / usb / mixer.c

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 0b728d886f0d071460ffa2765ce558be43399435..2e4a9dbc51faeca29529da8d231d779a10b92aed 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1340,12 +1340,11 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
         */
        if (range > 384) {
                usb_audio_warn(state->chip,
-                              "Warning! Unlikely big volume range (=%u), "
-                              "cval->res is probably wrong.",
+                              "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.",
                               range);
-               usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, "
-                              "val = %d/%d/%d", cval->id,
-                              kctl->id.name, cval->channels,
+               usb_audio_warn(state->chip,
+                              "[%d] FU [%s] ch = %d, val = %d/%d/%d",
+                              cval->id, kctl->id.name, cval->channels,
                               cval->min, cval->max, cval->res);
        }