iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rt298: Make rt298_index_def const

Browse Source 
The index_cache is per instance run time state but rt298_index_def is not.
Make rt298_index_def const and make a copy of memory for index_cache rather
than directly use the rt298_index_def.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin
2015-10-05 21:23:48 +08:00
committed by Mark Brown
parent a5fe58fd28
commit 3943b9efb3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/rt298.c
View File

@ -49,7 +49,7 @@ struct rt298_priv {
int is_hp_in; int is_hp_in;
}; };
static struct reg_default rt298_index_def[] = { static const struct reg_default rt298_index_def[] = {
{ 0x01, 0xaaaa }, { 0x01, 0xaaaa },
{ 0x02, 0x8aaa }, { 0x02, 0x8aaa },
{ 0x03, 0x0002 }, { 0x03, 0x0002 },
@ -1165,7 +1165,11 @@ static int rt298_i2c_probe(struct i2c_client *i2c,
return -ENODEV; return -ENODEV;
} }
rt298->index_cache = rt298_index_def; rt298->index_cache = devm_kmemdup(&i2c->dev, rt298_index_def,
sizeof(rt298_index_def), GFP_KERNEL);
if (!rt298->index_cache)
return -ENOMEM;
rt298->index_cache_size = INDEX_CACHE_SIZE; rt298->index_cache_size = INDEX_CACHE_SIZE;
rt298->i2c = i2c; rt298->i2c = i2c;
i2c_set_clientdata(i2c, rt298); i2c_set_clientdata(i2c, rt298);