| Message ID | 1393483292-30412-1-git-send-email-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Feb 27, 2014 at 07:41:32AM +0100, Takashi Iwai wrote: > I'd like to put this as a quick fix for the next 3.14 pull request. > So, if you don't mind, I'm going to commit to my tree for-linus > branch. I actually have another small batch of stuff to send you anyway, that earlier lot was flushing out a pull request I'd generated but not sent, the next one was going to appear today anyway (just waiting for a little while for the zero day tester). I'll roll this one into that if that's OK?
At Thu, 27 Feb 2014 16:53:17 +0900, Mark Brown wrote: > > On Thu, Feb 27, 2014 at 07:41:32AM +0100, Takashi Iwai wrote: > > > I'd like to put this as a quick fix for the next 3.14 pull request. > > So, if you don't mind, I'm going to commit to my tree for-linus > > branch. > > I actually have another small batch of stuff to send you anyway, that > earlier lot was flushing out a pull request I'd generated but not sent, > the next one was going to appear today anyway (just waiting for a little > while for the zero day tester). I'll roll this one into that if that's > OK? Fine for me. Then I'm going to push out my tree with your previous request merged now, then will pull the next request on top of that. Takashi
On Thu, Feb 27, 2014 at 09:25:24AM +0100, Takashi Iwai wrote: > Fine for me. Then I'm going to push out my tree with your previous > request merged now, then will pull the next request on top of that. Great, I'll send a further request tonight.
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index ea78c172538c..2735361a4c3c 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -434,7 +434,7 @@ SOC_SINGLE_TLV("Treble Tone Control", STA32X_TONE, STA32X_TONE_TTC_SHIFT, 15, 0, SOC_ENUM("Limiter1 Attack Rate (dB/ms)", sta32x_limiter1_attack_rate_enum), SOC_ENUM("Limiter2 Attack Rate (dB/ms)", sta32x_limiter2_attack_rate_enum), SOC_ENUM("Limiter1 Release Rate (dB/ms)", sta32x_limiter1_release_rate_enum), -SOC_ENUM("Limiter2 Release Rate (dB/ms)", sta32x_limiter1_release_rate_enum), +SOC_ENUM("Limiter2 Release Rate (dB/ms)", sta32x_limiter2_release_rate_enum), /* depending on mode, the attack/release thresholds have * two different enum definitions; provide both
There is a typo in the Limiter2 Release Rate control, a wrong enum for Limiter1 is assigned. It must point to Limiter2. Spotted by a compile warning: In file included from sound/soc/codecs/sta32x.c:34:0: sound/soc/codecs/sta32x.c:223:29: warning: ‘sta32x_limiter2_release_rate_enum’ defined but not used [-Wunused-variable] static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_release_rate_enum, ^ include/sound/soc.h:275:18: note: in definition of macro ‘SOC_ENUM_DOUBLE_DECL’ struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \ ^ sound/soc/codecs/sta32x.c:223:8: note: in expansion of macro ‘SOC_ENUM_SINGLE_DECL’ static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_release_rate_enum, ^ Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- Mark, this comes up after merging your pull request. Interestingly, the warning is triggered because const was temporarily reduced along my changes. Since my whole patch series added the const in the macro definition, I didn't see this. Ditto for linux-next, where no relevant warning is seen. I'd like to put this as a quick fix for the next 3.14 pull request. So, if you don't mind, I'm going to commit to my tree for-linus branch. Takashi sound/soc/codecs/sta32x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)