From 91e6977afd0e8ea114bbdc21cab13ff90188ed27 Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Sat, 6 Aug 2011 13:26:20 +0200 Subject: [PATCH] --- yaml --- r: 262679 b: refs/heads/master c: 67ada8367c323ce13d0268c87cf09bf8af956e92 h: refs/heads/master i: 262677: 8ca39c23b51da757e1a6f10cea62e6945487db9d 262675: 37c1fae2b2b97e4709cd097c9cd951afaaf1b431 262671: da1a2babaf9d759e114545df6543bd32fbaf65d4 v: v3 --- [refs] | 2 +- trunk/sound/pci/asihpi/hpicmn.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4a42c47131f8..5bffb2677800 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4389489b5cbe60b3441869c68bb4afe760969c4 +refs/heads/master: 67ada8367c323ce13d0268c87cf09bf8af956e92 diff --git a/trunk/sound/pci/asihpi/hpicmn.c b/trunk/sound/pci/asihpi/hpicmn.c index 65b7ca13115b..bd47521b24ec 100644 --- a/trunk/sound/pci/asihpi/hpicmn.c +++ b/trunk/sound/pci/asihpi/hpicmn.c @@ -631,13 +631,12 @@ struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count, if (!p_cache) return NULL; - p_cache->p_info = - kmalloc(sizeof(*p_cache->p_info) * control_count, GFP_KERNEL); + p_cache->p_info = kzalloc(sizeof(*p_cache->p_info) * control_count, + GFP_KERNEL); if (!p_cache->p_info) { kfree(p_cache); return NULL; } - memset(p_cache->p_info, 0, sizeof(*p_cache->p_info) * control_count); p_cache->cache_size_in_bytes = size_in_bytes; p_cache->control_count = control_count; p_cache->p_cache = p_dsp_control_buffer;