diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 15:37:12 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 15:37:12 +0100 |
commit | 5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5 (patch) | |
tree | f1dc7af60020ac245fdbedc108c7c790ad7d0c9c /sound | |
parent | ALSA: hda - Remove non-working headphone control for Dell laptops (diff) | |
parent | ALSA: Fix a Oops bug in omap soc driver. (diff) | |
download | linux-5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5.tar.xz linux-5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5.zip |
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) if (ret < 0) goto out; - prtd = kzalloc(sizeof(prtd), GFP_KERNEL); + prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); if (prtd == NULL) { ret = -ENOMEM; goto out; |