aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/uda134x.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
-rw-r--r--sound/soc/codecs/uda134x.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index c33b92edbded..a8dcd5a5bbcb 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -15,6 +15,7 @@
15 15
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/delay.h> 17#include <linux/delay.h>
18#include <linux/slab.h>
18#include <sound/pcm.h> 19#include <sound/pcm.h>
19#include <sound/pcm_params.h> 20#include <sound/pcm_params.h>
20#include <sound/soc.h> 21#include <sound/soc.h>
@@ -101,7 +102,7 @@ static int uda134x_write(struct snd_soc_codec *codec, unsigned int reg,
101 pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); 102 pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value);
102 103
103 if (reg >= UDA134X_REGS_NUM) { 104 if (reg >= UDA134X_REGS_NUM) {
104 printk(KERN_ERR "%s unkown register: reg: %u", 105 printk(KERN_ERR "%s unknown register: reg: %u",
105 __func__, reg); 106 __func__, reg);
106 return -EINVAL; 107 return -EINVAL;
107 } 108 }
@@ -552,7 +553,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
552 ARRAY_SIZE(uda1341_snd_controls)); 553 ARRAY_SIZE(uda1341_snd_controls));
553 break; 554 break;
554 default: 555 default:
555 printk(KERN_ERR "%s unkown codec type: %d", 556 printk(KERN_ERR "%s unknown codec type: %d",
556 __func__, pd->model); 557 __func__, pd->model);
557 return -EINVAL; 558 return -EINVAL;
558 } 559 }
@@ -562,17 +563,8 @@ static int uda134x_soc_probe(struct platform_device *pdev)
562 goto pcm_err; 563 goto pcm_err;
563 } 564 }
564 565
565 ret = snd_soc_init_card(socdev);
566 if (ret < 0) {
567 printk(KERN_ERR "UDA134X: failed to register card\n");
568 goto card_err;
569 }
570
571 return 0; 566 return 0;
572 567
573card_err:
574 snd_soc_free_pcms(socdev);
575 snd_soc_dapm_free(socdev);
576pcm_err: 568pcm_err:
577 kfree(codec->reg_cache); 569 kfree(codec->reg_cache);
578reg_err: 570reg_err: