diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /sound/core/sgbuf.c | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'sound/core/sgbuf.c')
| -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, | |||
| 101 | if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, device, | 101 | if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, device, |
| 102 | chunk, &tmpb) < 0) { | 102 | chunk, &tmpb) < 0) { |
| 103 | if (!sgbuf->pages) | 103 | if (!sgbuf->pages) |
| 104 | return NULL; | 104 | goto _failed; |
| 105 | if (!res_size) | 105 | if (!res_size) |
| 106 | goto _failed; | 106 | goto _failed; |
| 107 | size = sgbuf->pages * PAGE_SIZE; | 107 | size = sgbuf->pages * PAGE_SIZE; |