diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 16:24:46 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 16:24:46 +0300 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/soc/codecs/wm8903.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
| download | linux-7fb3a069bc5d3577409c2ae89f89cd264ff85816.tar.xz | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index ce5515e3f2b0..3595bd57c4eb 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1504,7 +1504,7 @@ static int wm8903_resume(struct platform_device *pdev) struct i2c_client *i2c = codec->control_data; int i; u16 *reg_cache = codec->reg_cache; - u16 *tmp_cache = kmemdup(codec->reg_cache, sizeof(wm8903_reg_defaults), + u16 *tmp_cache = kmemdup(reg_cache, sizeof(wm8903_reg_defaults), GFP_KERNEL); /* Bring the codec back up to standby first to minimise pop/clicks */ @@ -1516,6 +1516,7 @@ static int wm8903_resume(struct platform_device *pdev) for (i = 2; i < ARRAY_SIZE(wm8903_reg_defaults); i++) if (tmp_cache[i] != reg_cache[i]) snd_soc_write(codec, i, tmp_cache[i]); + kfree(tmp_cache); } else { dev_err(&i2c->dev, "Failed to allocate temporary cache\n"); } |