From 94611705eab8bb2b07e1422d6c5e1b7dc9d6e028 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 31 Jul 2012 18:39:20 +0200 Subject: [PATCH] --- yaml --- r: 333422 b: refs/heads/master c: c1f383d97c5b0db5d5c75f996bc1b596efa9ebf8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fsl-diu-fb.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 350c20652352..535b7d9abe79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae1937f69b1f04dcb2a855d66f94860a6bcf7620 +refs/heads/master: c1f383d97c5b0db5d5c75f996bc1b596efa9ebf8 diff --git a/trunk/drivers/video/fsl-diu-fb.c b/trunk/drivers/video/fsl-diu-fb.c index 458c00664ade..ede9e55413f8 100644 --- a/trunk/drivers/video/fsl-diu-fb.c +++ b/trunk/drivers/video/fsl-diu-fb.c @@ -1501,8 +1501,8 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev) unsigned int i; int ret; - data = dma_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data), - &dma_addr, GFP_DMA | __GFP_ZERO); + data = dmam_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data), + &dma_addr, GFP_DMA | __GFP_ZERO); if (!data) return -ENOMEM; data->dma_addr = dma_addr; @@ -1628,9 +1628,6 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev) iounmap(data->diu_reg); - dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data, - data->dma_addr); - return ret; } @@ -1648,9 +1645,6 @@ static int fsl_diu_remove(struct platform_device *pdev) iounmap(data->diu_reg); - dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data, - data->dma_addr); - return 0; }