Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / drivers / dma / timb_dma.c

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 559cd4073698ce806bf448274af6458bdb89ff83..e82745aa42a8bfc5deaecfb62f39d1b2a2972278 100644 (file)
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -337,18 +337,14 @@ static struct timb_dma_desc *td_alloc_init_desc(struct timb_dma_chan *td_chan)
        int err;
 
        td_desc = kzalloc(sizeof(struct timb_dma_desc), GFP_KERNEL);
-       if (!td_desc) {
-               dev_err(chan2dev(chan), "Failed to alloc descriptor\n");
+       if (!td_desc)
                goto out;
-       }
 
        td_desc->desc_list_len = td_chan->desc_elems * TIMB_DMA_DESC_SIZE;
 
        td_desc->desc_list = kzalloc(td_desc->desc_list_len, GFP_KERNEL);
-       if (!td_desc->desc_list) {
-               dev_err(chan2dev(chan), "Failed to alloc descriptor\n");
+       if (!td_desc->desc_list)
                goto err;
-       }
 
        dma_async_tx_descriptor_init(&td_desc->txd, chan);
        td_desc->txd.tx_submit = td_tx_submit;