diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 09:36:58 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 09:36:58 -0500 |
commit | 70043058a6968917c00c8d4cff5bfc0e095831ec (patch) | |
tree | 3f542caeb00c9081d089d34f98c58feca6ac64d8 /sound | |
parent | 40aa4a30d0fd075fb934de4ee8163056827052ab (diff) | |
parent | 19b3f31609dc8be3a56c78dcb7da723f10f7009c (diff) |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index ce580a97cbd5..803581c9280d 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) | |||
233 | if (ret < 0) | 233 | if (ret < 0) |
234 | goto out; | 234 | goto out; |
235 | 235 | ||
236 | prtd = kzalloc(sizeof(prtd), GFP_KERNEL); | 236 | prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); |
237 | if (prtd == NULL) { | 237 | if (prtd == NULL) { |
238 | ret = -ENOMEM; | 238 | ret = -ENOMEM; |
239 | goto out; | 239 | goto out; |