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",