diff options
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index e6b990507df2..7ca0b5268289 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -543,14 +543,10 @@ static int wm8731_init(struct snd_soc_device *socdev) | |||
543 | codec->dapm_event = wm8731_dapm_event; | 543 | codec->dapm_event = wm8731_dapm_event; |
544 | codec->dai = &wm8731_dai; | 544 | codec->dai = &wm8731_dai; |
545 | codec->num_dai = 1; | 545 | codec->num_dai = 1; |
546 | codec->reg_cache_size = ARRAY_SIZE(wm8731_reg); | 546 | codec->reg_cache_size = sizeof(wm8731_reg); |
547 | codec->reg_cache = | 547 | codec->reg_cache = kmemdup(wm8731_reg, sizeof(wm8731_reg), GFP_KERNEL); |
548 | kzalloc(sizeof(u16) * ARRAY_SIZE(wm8731_reg), GFP_KERNEL); | ||
549 | if (codec->reg_cache == NULL) | 548 | if (codec->reg_cache == NULL) |
550 | return -ENOMEM; | 549 | return -ENOMEM; |
551 | memcpy(codec->reg_cache, | ||
552 | wm8731_reg, sizeof(u16) * ARRAY_SIZE(wm8731_reg)); | ||
553 | codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm8731_reg); | ||
554 | 550 | ||
555 | wm8731_reset(codec); | 551 | wm8731_reset(codec); |
556 | 552 | ||
@@ -627,12 +623,11 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
627 | client_template.adapter = adap; | 623 | client_template.adapter = adap; |
628 | client_template.addr = addr; | 624 | client_template.addr = addr; |
629 | 625 | ||
630 | i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 626 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
631 | if (i2c == NULL) { | 627 | if (i2c == NULL) { |
632 | kfree(codec); | 628 | kfree(codec); |
633 | return -ENOMEM; | 629 | return -ENOMEM; |
634 | } | 630 | } |
635 | memcpy(i2c, &client_template, sizeof(struct i2c_client)); | ||
636 | i2c_set_clientdata(i2c, codec); | 631 | i2c_set_clientdata(i2c, codec); |
637 | codec->control_data = i2c; | 632 | codec->control_data = i2c; |
638 | 633 | ||