[PATCH 2.6.26-rc2] ASoC: Fix wrong enum count for jack_function in N810 machine driver

[PATCH 2.6.26-rc2] ASoC: Fix wrong enum count for jack_function in N810 machine driver

[Jarkko Nikula]

Fix this typo and avoid similar errors by using ARRAY_SIZE macro.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 sound/soc/omap/n810.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 83b1eb4..6533563 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -188,8 +188,8 @@ static const char *audio_map[][3] = {
 static const char *spk_function[] = {"Off", "On"};
 static const char *jack_function[] = {"Off", "Headphone"};
 static const struct soc_enum n810_enum[] = {
-	SOC_ENUM_SINGLE_EXT(2, spk_function),
-	SOC_ENUM_SINGLE_EXT(3, jack_function),
+	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
+	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function),
 };
 
 static const struct snd_kcontrol_new aic33_n810_controls[] = {
-- 
1.5.5.1

Re: [PATCH 2.6.26-rc2] ASoC: Fix wrong enum count for jack_function in N810 machine driver

[Mark Brown]

On Tue, May 13, 2008 at 03:42:04PM +0300, Jarkko Nikula wrote:

> Fix this typo and avoid similar errors by using ARRAY_SIZE macro.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

and queued for Takashi if he doesn't pick it up directly first.

Re: [PATCH 2.6.26-rc2] ASoC: Fix wrong enum count for jack_function in N810 machine driver

[Takashi Iwai]

At Tue, 13 May 2008 14:23:53 +0100,
Mark Brown wrote:
> 
> On Tue, May 13, 2008 at 03:42:04PM +0300, Jarkko Nikula wrote:
> 
> > Fix this typo and avoid similar errors by using ARRAY_SIZE macro.
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> and queued for Takashi if he doesn't pick it up directly first.

I did :)  Will be for the next push round.


Thanks anyway.

Takashi