From e566523008c6a4b7ae2f0bc9779212538cdb8789 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 29 Oct 2008 15:34:39 -0700 Subject: [PATCH] --- yaml --- r: 118231 b: refs/heads/master c: be376649344ba2c3d00021f8bbf64392aa01ad55 h: refs/heads/master i: 118229: e3d3614ee830b3505e9d0cd742ab8465e936181e 118227: 688baebd28c1b56eb70aa86e4f29a40cdcca8962 118223: 065b921820e137ace83f9c7df548c070874a9726 v: v3 --- [refs] | 2 +- trunk/sound/sparc/dbri.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b202950e9730..7f55346dcaaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1758ef68a07f42983371dc1d2bf0ae80b4d8ea16 +refs/heads/master: be376649344ba2c3d00021f8bbf64392aa01ad55 diff --git a/trunk/sound/sparc/dbri.c b/trunk/sound/sparc/dbri.c index c257ad8bdfbc..23ed6f04a718 100644 --- a/trunk/sound/sparc/dbri.c +++ b/trunk/sound/sparc/dbri.c @@ -2534,6 +2534,8 @@ static int __devinit snd_dbri_create(struct snd_card *card, dbri->dma = dma_alloc_coherent(&op->dev, sizeof(struct dbri_dma), &dbri->dma_dvma, GFP_ATOMIC); + if (!dbri->dma) + return -ENOMEM; memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",