github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video/rockchip/rk_fb: fix compile warning

Browse Source 
drivers/video/rockchip/rk_fb.c:4002:4: warning: this else
clause does not guard... [-Wmisleading-indentation]

Change-Id: I4c75dea72a2ebde8f1271334f91d5fd890274017
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang 2018-02-07 19:23:13 +08:00
parent 6e1a9a5ca4
commit dcc52ea50d
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/video/rockchip/rk_fb.c
View File

@ -4002,27 +4002,27 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi)
else
fb_par->ion_hdl =
dev_drv_prmry->win[win_id_prmry]->area[0].ion_hdl;
fbi->screen_base =
ion_map_kernel(rk_fb->ion_client,
fb_par->ion_hdl);
dev_drv->win[win_id]->area[0].ion_hdl =
fb_par->ion_hdl;
if (dev_drv->mmu_dev)
ret = ion_map_iommu(dev_drv->dev,
rk_fb->ion_client,
fb_par->ion_hdl,
(unsigned long *)&phy_addr,
(unsigned long *)&len);
else
ret = ion_phys(rk_fb->ion_client,
fb_par->ion_hdl,
&phy_addr, &len);
if (ret < 0) {
dev_err(fbi->dev, "ion map to get phy addr failed\n");
return -ENOMEM;
}
fbi->fix.smem_start = phy_addr;
fbi->fix.smem_len = len;
fbi->screen_base =
ion_map_kernel(rk_fb->ion_client,
fb_par->ion_hdl);
dev_drv->win[win_id]->area[0].ion_hdl =
fb_par->ion_hdl;
if (dev_drv->mmu_dev)
ret = ion_map_iommu(dev_drv->dev,
rk_fb->ion_client,
fb_par->ion_hdl,
(unsigned long *)&phy_addr,
(unsigned long *)&len);
else
ret = ion_phys(rk_fb->ion_client,
fb_par->ion_hdl,
&phy_addr, &len);
if (ret < 0) {
dev_err(fbi->dev, "ion map to get phy addr failed\n");
return -ENOMEM;
}
fbi->fix.smem_start = phy_addr;
fbi->fix.smem_len = len;
#else
fb_mem_virt = dma_alloc_writecombine(fbi->dev,
fb_mem_size,