1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index d738e5b3ae45..dabb1affa2ca 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -106,7 +106,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
         union omap_gem_size gsize;
         struct fb_info *fbi = NULL;
         struct drm_mode_fb_cmd2 mode_cmd = {0};
-        dma_addr_t paddr;
+        dma_addr_t dma_addr;
         int ret;
 
         sizes->surface_bpp = 32;
@@ -162,7 +162,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
          * to it).  Then we just need to be sure that we are able to re-
          * pin it in case of an opps.
          */
-        ret = omap_gem_get_paddr(fbdev->bo, &paddr);
+        ret = omap_gem_get_paddr(fbdev->bo, &dma_addr);
         if (ret) {
                 dev_err(dev->dev,
                         "could not map (paddr)!  Skipping framebuffer alloc\n");
@@ -193,11 +193,11 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
         drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth);
         drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
 
-        dev->mode_config.fb_base = paddr;
+        dev->mode_config.fb_base = dma_addr;
 
         fbi->screen_base = omap_gem_vaddr(fbdev->bo);
         fbi->screen_size = fbdev->bo->size;
-        fbi->fix.smem_start = paddr;
+        fbi->fix.smem_start = dma_addr;
         fbi->fix.smem_len = fbdev->bo->size;
 
         /* if we have DMM, then we can use it for scrolling by just