From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 19 Dec 2008 14:37:12 +0000 (+0100)
Subject: Merge branch 'fix/asoc' into for-linus
X-Git-Tag: v2.6.28~19^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5;hp=8f55c1e51fbb03998708bdd97d5b6665ab92462d;p=linux-2.6-omap-h63xx.git

Merge branch 'fix/asoc' into for-linus
---

diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index e9084fdd208..acd68efb2b7 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -233,7 +233,7 @@ static int omap_pcm_open(struct snd_pcm_substream *substream)
 	if (ret < 0)
 		goto out;
 
-	prtd = kzalloc(sizeof(prtd), GFP_KERNEL);
+	prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);
 	if (prtd == NULL) {
 		ret = -ENOMEM;
 		goto out;