diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 10:52:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 10:52:51 -0400 |
| commit | 63b40456a30912084c90753582137b9e0495c5c3 (patch) | |
| tree | eedba8710d0ba3c802ecf77f46ed6ab2c73e2149 /sound | |
| parent | eff2502801e9a3a34882c6bd720470d65394522e (diff) | |
| parent | 770a424112cb2c3a3e39221299eaf5244b76479a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add missing null terminating entry to bq4802_match[].
sparc: use the new byteorder headers
rtc-m48t59: shift zero year to 1968 on sparc (rev 2)
dbri: check dma_alloc_coherent errors
sparc64: remove byteshifting from out* helpers
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/sparc/dbri.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index c257ad8bdfbc..23ed6f04a718 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
| @@ -2534,6 +2534,8 @@ static int __devinit snd_dbri_create(struct snd_card *card, | |||
| 2534 | dbri->dma = dma_alloc_coherent(&op->dev, | 2534 | dbri->dma = dma_alloc_coherent(&op->dev, |
| 2535 | sizeof(struct dbri_dma), | 2535 | sizeof(struct dbri_dma), |
| 2536 | &dbri->dma_dvma, GFP_ATOMIC); | 2536 | &dbri->dma_dvma, GFP_ATOMIC); |
| 2537 | if (!dbri->dma) | ||
| 2538 | return -ENOMEM; | ||
| 2537 | memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); | 2539 | memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); |
| 2538 | 2540 | ||
| 2539 | dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n", | 2541 | dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n", |