summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-13 09:56:57 +0200
committerTakashi Iwai <tiwai@suse.de>2012-09-13 09:59:44 +0200
commit03efce755cf1b4cf1c14007e118dd1671e39f862 (patch)
tree222057b87b8a0a25c57401c41fe1f22c53a23b0f
parentef596a57b4d7d8b258beb570ed309ef85bf24dd1 (diff)
downloadlinux-3.10-03efce755cf1b4cf1c14007e118dd1671e39f862.tar.gz
linux-3.10-03efce755cf1b4cf1c14007e118dd1671e39f862.tar.bz2
linux-3.10-03efce755cf1b4cf1c14007e118dd1671e39f862.zip
ALSA: hda - Fix disordered enum definitions in patch_cirrus.c
Due to the definitions of CS420X_IMAC27_122 and CS420X_APPLE as aliases, the rest enums are set to duplicated values unexpectedly. Move the alias definitions at the end so that the enum values are defined in the proper order. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_cirrus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 82253f13735..fcfc9f0a056 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -83,11 +83,12 @@ enum {
CS420X_IMAC27,
CS420X_GPIO_13,
CS420X_GPIO_23,
- CS420X_IMAC27_122 = CS420X_GPIO_23,
- CS420X_APPLE = CS420X_GPIO_13,
CS420X_MBP101,
CS420X_MBP101_COEF,
CS420X_AUTO,
+ /* aliases */
+ CS420X_IMAC27_122 = CS420X_GPIO_23,
+ CS420X_APPLE = CS420X_GPIO_13,
};
/* CS421x boards */