aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fsl-diu-fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fsl-diu-fb.c')
-rw-r--r--drivers/video/fsl-diu-fb.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 458c00664ade..ede9e55413f8 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1501,8 +1501,8 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
1501 unsigned int i; 1501 unsigned int i;
1502 int ret; 1502 int ret;
1503 1503
1504 data = dma_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data), 1504 data = dmam_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data),
1505 &dma_addr, GFP_DMA | __GFP_ZERO); 1505 &dma_addr, GFP_DMA | __GFP_ZERO);
1506 if (!data) 1506 if (!data)
1507 return -ENOMEM; 1507 return -ENOMEM;
1508 data->dma_addr = dma_addr; 1508 data->dma_addr = dma_addr;
@@ -1628,9 +1628,6 @@ error:
1628 1628
1629 iounmap(data->diu_reg); 1629 iounmap(data->diu_reg);
1630 1630
1631 dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
1632 data->dma_addr);
1633
1634 return ret; 1631 return ret;
1635} 1632}
1636 1633
@@ -1648,9 +1645,6 @@ static int fsl_diu_remove(struct platform_device *pdev)
1648 1645
1649 iounmap(data->diu_reg); 1646 iounmap(data->diu_reg);
1650 1647
1651 dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
1652 data->dma_addr);
1653
1654 return 0; 1648 return 0;
1655} 1649}
1656 1650