diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 11:37:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 11:37:07 -0800 |
| commit | 8837e341cc76372716b1576dd88fbf832acd29d4 (patch) | |
| tree | 7e11c9c6116e570a5305a2101d41bae0f1b226dd /sound/soc/omap/omap-pcm.c | |
| parent | 281981ca87b9181e5408b0a7b33d3d7cf0c9a5ca (diff) | |
| parent | 5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: Fix a Oops bug in omap soc driver.
ALSA: hda - Remove non-working headphone control for Dell laptops
ALSA: hda - Add no-jd model for IDT 92HD73xx
ALSA: Revert "ALSA: hda: removed unneeded hp_nid references"
ALSA: hda - Add quirk for Dell Studio 17
ALSA: hda - Fix silent HP output on D975
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -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 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; |