| Message ID | 04a9938055f532572d1852b8c856d45b37ac9cde.1405864895.git.mirq-linux@rere.qmqm.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Takashi Iwai |
| Headers | show |
At Sun, 20 Jul 2014 16:05:25 +0200 (CEST), Micha? Miros?aw wrote: > > This fixes messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810. Well, this doesn't "fix". The original code is suboptimal regarding the grepability, but it's different from "broken". In anyway, the patch isn't cleanly applicable. The changes look good, so please resubmit the applicable patch with rephrased subject / changelog. thanks, Takashi > > Signed-off-by: Micha? Miroslaw <mirq-linux@rere.qmqm.pl> > > --- > sound/usb/mixer.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index d40a285..a278b82 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -1305,13 +1305,13 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, > * devices. It will definitively catch all buggy Logitech devices. > */ > if (range > 384) { > - usb_audio_warn(state->chip, "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, > - cval->min, cval->max, cval->res); > + usb_audio_warn(state->chip, > + "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, > + cval->min, cval->max, cval->res); > } > > usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n", > -- > 2.0.1 >
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index d40a285..a278b82 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1305,13 +1305,13 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, * devices. It will definitively catch all buggy Logitech devices. */ if (range > 384) { - usb_audio_warn(state->chip, "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, - cval->min, cval->max, cval->res); + usb_audio_warn(state->chip, + "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, + cval->min, cval->max, cval->res); } usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
This fixes messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810. Signed-off-by: Micha? Miroslaw <mirq-linux@rere.qmqm.pl> --- sound/usb/mixer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)