From 3320ca773ee5c02c4900fc6a952016474b00e6eb Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 16 Apr 2007 15:35:46 +0200 Subject: [PATCH] --- yaml --- r: 56165 b: refs/heads/master c: 30652c4506c8bbfdf869ddc4c238e07de038f02a h: refs/heads/master i: 56163: 4ce91e41a7ad5e6bae67dc7ba4a511b79492cd86 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm9712.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e33d11c85044..e56ece7710b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 826220463f619d14c5efea51aac6277b441052b8 +refs/heads/master: 30652c4506c8bbfdf869ddc4c238e07de038f02a diff --git a/trunk/sound/soc/codecs/wm9712.c b/trunk/sound/soc/codecs/wm9712.c index ee7a691a9ba1..264413a00cac 100644 --- a/trunk/sound/soc/codecs/wm9712.c +++ b/trunk/sound/soc/codecs/wm9712.c @@ -676,14 +676,13 @@ static int wm9712_soc_probe(struct platform_device *pdev) codec = socdev->codec; mutex_init(&codec->mutex); - codec->reg_cache = - kzalloc(sizeof(u16) * ARRAY_SIZE(wm9712_reg), GFP_KERNEL); + codec->reg_cache = kmemdup(wm9712_reg, sizeof(wm9712_reg), GFP_KERNEL); + if (codec->reg_cache == NULL) { ret = -ENOMEM; goto cache_err; } - memcpy(codec->reg_cache, wm9712_reg, sizeof(u16) * ARRAY_SIZE(wm9712_reg)); - codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm9712_reg); + codec->reg_cache_size = sizeof(wm9712_reg); codec->reg_cache_step = 2; codec->name = "WM9712";