summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra_wm8903.c
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2012-05-30 14:34:47 -0400
committerVarun Colbert <vcolbert@nvidia.com>2012-06-15 12:19:03 -0700
commitdaf2ee7b9eefb84d2140152786ba8a19674b4fe6 (patch)
tree0487e053919c9af7a737450d65ff773b45081461 /sound/soc/tegra/tegra_wm8903.c
parentd4f98e0a7729fefb38ca459853b2f57f3bdfa862 (diff)
sound: soc: tegra: fix compilation errors
Several compilation errors popped up when building the 3.1 kernel for chrome. Warnings included callback structure changing and not being updated in the max98095 codec driver and unused labels. With these change I am able to compile in the max98095 codec support and wm8903 without build errors. Bug 986933 Change-Id: Ia8b2511f54b031eadcad8c74efa88be9288f25fb Signed-off-by: Rhyland Klein <rklein@nvidia.com> Reviewed-on: http://git-master/r/105464 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
-rw-r--r--sound/soc/tegra/tegra_wm8903.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 147546575233..063aefe50507 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -902,8 +902,8 @@ err_unregister_card:
err_unregister_switch:
#ifdef CONFIG_SWITCH
switch_dev_unregister(&tegra_wm8903_headset_switch);
-#endif
err_fini_utils:
+#endif
tegra_asoc_utils_fini(&machine->util_data);
err_free_machine:
kfree(machine);