diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 08:11:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 02:42:53 +0100 |
| commit | 9a8d38db030f016bee45b927af02d9b46398ed46 (patch) | |
| tree | 3f0e1d8e3d42778880caf5ac6f4bfef6e96dc5c0 /sound/soc/omap/ams-delta.c | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-9a8d38db030f016bee45b927af02d9b46398ed46.tar.xz linux-9a8d38db030f016bee45b927af02d9b46398ed46.zip | |
ASoC: Rename soc_enum.max field with items
The name "max" in struct soc_enum is rather confusing since it
actually takes the number of items. With "max", one might try to
assign (nitems - 1) value.
Rename the field to a more appropriate one, "items", which is also
used in struct snd_ctl_elem_info, too.
This patch also rewrites some code like "if (x > e->nitems - 1)" with
"if (x >= e->nitems)". Not only the latter improves the readability,
it also fixes a potential bug when e->items is zero.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/omap/ams-delta.c')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 629446482a91..2eca91a51f51 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -103,7 +103,7 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol, if (!codec->hw_write) return -EUNATCH; - if (ucontrol->value.enumerated.item[0] >= control->max) + if (ucontrol->value.enumerated.item[0] >= control->items) return -EINVAL; mutex_lock(&codec->mutex); |