diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-02-05 08:56:20 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:03:56 -0500 |
commit | 88cb42901f1572c95f5933f363cfebd5044c716a (patch) | |
tree | 8eed3d46c81996e780375ff91ae1955f3265629d /sound/soc/codecs/wm8750.c | |
parent | 1ab774e049085da6facfaf3b24d54158c3f0f5b3 (diff) |
[ALSA] soc - Clean up with kmemdup()
Clean up by replacing with kmemdup().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/codecs/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index c1ffb61ef7f7..7073e8e294fc 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -807,15 +807,10 @@ static int wm8750_init(struct snd_soc_device *socdev) | |||
807 | codec->dapm_event = wm8750_dapm_event; | 807 | codec->dapm_event = wm8750_dapm_event; |
808 | codec->dai = &wm8750_dai; | 808 | codec->dai = &wm8750_dai; |
809 | codec->num_dai = 1; | 809 | codec->num_dai = 1; |
810 | codec->reg_cache_size = ARRAY_SIZE(wm8750_reg); | 810 | codec->reg_cache_size = sizeof(wm8750_reg); |
811 | 811 | codec->reg_cache = kmemdup(wm8750_reg, sizeof(wm8750_reg), GFP_KRENEL); | |
812 | codec->reg_cache = | ||
813 | kzalloc(sizeof(u16) * ARRAY_SIZE(wm8750_reg), GFP_KERNEL); | ||
814 | if (codec->reg_cache == NULL) | 812 | if (codec->reg_cache == NULL) |
815 | return -ENOMEM; | 813 | return -ENOMEM; |
816 | memcpy(codec->reg_cache, wm8750_reg, | ||
817 | sizeof(u16) * ARRAY_SIZE(wm8750_reg)); | ||
818 | codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm8750_reg); | ||
819 | 814 | ||
820 | wm8750_reset(codec); | 815 | wm8750_reset(codec); |
821 | 816 | ||
@@ -900,12 +895,11 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
900 | client_template.adapter = adap; | 895 | client_template.adapter = adap; |
901 | client_template.addr = addr; | 896 | client_template.addr = addr; |
902 | 897 | ||
903 | i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 898 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
904 | if (i2c == NULL) { | 899 | if (i2c == NULL) { |
905 | kfree(codec); | 900 | kfree(codec); |
906 | return -ENOMEM; | 901 | return -ENOMEM; |
907 | } | 902 | } |
908 | memcpy(i2c, &client_template, sizeof(struct i2c_client)); | ||
909 | i2c_set_clientdata(i2c, codec); | 903 | i2c_set_clientdata(i2c, codec); |
910 | codec->control_data = i2c; | 904 | codec->control_data = i2c; |
911 | 905 | ||