diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 19:59:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 19:59:52 +0300 |
| commit | 6666cabf5af309c1c3e63a36e2580879fb40e827 (patch) | |
| tree | b2d095042e5a8e71841162d4f0e2e4dd200b9ad5 /sound/core | |
| parent | 42a579a0f960081cd16fc945036e4780c3ad3202 (diff) | |
| parent | 012e7eb1e501d0120e0383b81477f63091f5e365 (diff) | |
| download | linux-6666cabf5af309c1c3e63a36e2580879fb40e827.tar.gz linux-6666cabf5af309c1c3e63a36e2580879fb40e827.tar.bz2 linux-6666cabf5af309c1c3e63a36e2580879fb40e827.zip | |
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Containing only a few really small/trivial fixes. The only urgent fix
is a regression fix of HDMI codec probing, introduced in 3.6-rc1. The
rest are HD-audio specific fixes and a copule of minor bug fixes in
PCM core and the old emu10k1."
* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix double quirk for Quanta FL1 / Lenovo Ideapad
ALSA: hda - Fix ugly debug prints with CONFIG_SND_VERBOSE_PRINTK=y
ALSA: hda - remove redundant auto quirks for conexant 506x
ALSA: hda - remove quirk for Dell Vostro 1015
ALSA: hda - add dock support for Thinkpad X230
ALSA: hda - Fix regression of HDMI codec probing
ALSA: hda - add dock support for Thinkpad T430s
ALSA: emu10k1: Avoid access to invalid pages when period=1
ALSA: PCM: Fix possible memory leaks in the error path
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/sgbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c index 4e7ec2b49873..d0f00356fc11 100644 --- a/sound/core/sgbuf.c +++ b/sound/core/sgbuf.c @@ -101,7 +101,7 @@ void *snd_malloc_sgbuf_pages(struct device *device, if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, device, chunk, &tmpb) < 0) { if (!sgbuf->pages) - return NULL; + goto _failed; if (!res_size) goto _failed; size = sgbuf->pages * PAGE_SIZE; |