diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 09:37:12 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 09:37:12 -0500 |
| commit | 5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5 (patch) | |
| tree | f1dc7af60020ac245fdbedc108c7c790ad7d0c9c /sound | |
| parent | 8f55c1e51fbb03998708bdd97d5b6665ab92462d (diff) | |
| parent | 19b3f31609dc8be3a56c78dcb7da723f10f7009c (diff) | |
Merge branch 'fix/asoc' into for-linus
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 e9084fdd2082..acd68efb2b75 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; |