summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-19 15:36:58 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-19 15:36:58 +0100
commit70043058a6968917c00c8d4cff5bfc0e095831ec (patch)
tree3f542caeb00c9081d089d34f98c58feca6ac64d8
parent40aa4a30d0fd075fb934de4ee8163056827052ab (diff)
parent19b3f31609dc8be3a56c78dcb7da723f10f7009c (diff)
downloadkernel-crypto-70043058a6968917c00c8d4cff5bfc0e095831ec.tar.gz
kernel-crypto-70043058a6968917c00c8d4cff5bfc0e095831ec.tar.xz
kernel-crypto-70043058a6968917c00c8d4cff5bfc0e095831ec.zip
Merge branch 'fix/asoc' into topic/asoc
-rw-r--r--sound/soc/omap/omap-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index ce580a97cbd..803581c9280 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;