Message ID | 1434483609-25498-1-git-send-email-mcgrof@do-not-panic.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
On Tue, Jun 16, 2015 at 12:40 PM, Luis R. Rodriguez <mcgrof@do-not-panic.com> wrote: > From: "Luis R. Rodriguez" <mcgrof@suse.com> > > dma_alloc_writecombine()'s call and return value check is tangled in all > in one call. Detangle both calls as we're used to. > > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Hey folks, can this be picked up for v4.2 or was it too late ? Luis -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jun 24, 2015 at 4:32 PM, Luis R. Rodriguez <mcgrof@suse.com> wrote: > On Tue, Jun 16, 2015 at 12:40 PM, Luis R. Rodriguez > <mcgrof@do-not-panic.com> wrote: >> From: "Luis R. Rodriguez" <mcgrof@suse.com> >> >> dma_alloc_writecombine()'s call and return value check is tangled in all >> in one call. Detangle both calls as we're used to. >> >> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> > > Hey folks, can this be picked up for v4.2 or was it too late ? OK well so this would be needed to do a full scrape change on the kernel for a rename of the API used, I'll merge this part of a bigger series now. If you can follow up on that series that would be appreciated. I'll cc you. Luis -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 9988268..e4f4312 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c @@ -1300,10 +1300,11 @@ static int iop_adma_probe(struct platform_device *pdev) * note: writecombine gives slightly better performance, but * requires that we explicitly flush the writes */ - if ((adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev, - plat_data->pool_size, - &adev->dma_desc_pool, - GFP_KERNEL)) == NULL) { + adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev, + plat_data->pool_size, + &adev->dma_desc_pool, + GFP_KERNEL); + if (!adev->dma_desc_pool_virt) { ret = -ENOMEM; goto err_free_adev; }