Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / drivers / video / fbdev / pxa168fb.c

diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
index 5615054a0cad5497ae44cc2d26480eda23b0d644..9b9ec1468347c93b9f6feebdeabf36da7110fe62 100644 (file)
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
@@ -545,7 +545,7 @@ static irqreturn_t pxa168fb_handle_irq(int irq, void *dev_id)
        return IRQ_NONE;
 }
 
-static struct fb_ops pxa168fb_ops = {
+static const struct fb_ops pxa168fb_ops = {
        .owner          = THIS_MODULE,
        .fb_check_var   = pxa168fb_check_var,
        .fb_set_par     = pxa168fb_set_par,
@@ -766,8 +766,8 @@ failed_free_cmap:
 failed_free_clk:
        clk_disable_unprepare(fbi->clk);
 failed_free_fbmem:
-       dma_free_coherent(fbi->dev, info->fix.smem_len,
-                       info->screen_base, fbi->fb_start_dma);
+       dma_free_wc(fbi->dev, info->fix.smem_len,
+                   info->screen_base, fbi->fb_start_dma);
 failed_free_info:
        kfree(info);
 
@@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
 
-       dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
+       dma_free_wc(fbi->dev, info->fix.smem_len,
                    info->screen_base, info->fix.smem_start);
 
        clk_disable_unprepare(fbi->clk);