lkml.org 
[lkml]   [2020]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] fbdev: geode: Add the missed pci_disable_device() in gx1fb_map_video_memory()
Date
Although gx1fb_probe() has handled the failure of gx1fb_map_video_memory()
partly, it does not call pci_disable_device() as gx1fb_map_video_memory()
calls pci_enable_device().
Add the missed function call to fix the bug.

Fixes: 53eed4ec8bcd ("[PATCH] fbdev: geode updates]")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
Changes in v2:
- Fix the typo in the subject.
- Modify the label of error handler.
- Refactor the code.

drivers/video/fbdev/geode/gx1fb_core.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/video/fbdev/geode/gx1fb_core.c b/drivers/video/fbdev/geode/gx1fb_core.c
index 5d34d89fb665..15645244e4d0 100644
--- a/drivers/video/fbdev/geode/gx1fb_core.c
+++ b/drivers/video/fbdev/geode/gx1fb_core.c
@@ -208,29 +208,39 @@ static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)

ret = pci_request_region(dev, 0, "gx1fb (video)");
if (ret < 0)
- return ret;
+ goto err_disable_device;
par->vid_regs = pci_ioremap_bar(dev, 0);
if (!par->vid_regs)
- return -ENOMEM;
+ goto err_nomem;

- if (!request_mem_region(gx_base + 0x8300, 0x100, "gx1fb (display controller)"))
- return -EBUSY;
+ if (!request_mem_region(gx_base + 0x8300, 0x100,
+ "gx1fb (display controller)")) {
+ ret = -EBUSY;
+ goto err_disable_device;
+ }
par->dc_regs = ioremap(gx_base + 0x8300, 0x100);
if (!par->dc_regs)
- return -ENOMEM;
+ goto err_nomem;

if ((fb_len = gx1_frame_buffer_size()) < 0)
- return -ENOMEM;
+ goto err_nomem;
+
info->fix.smem_start = gx_base + 0x800000;
info->fix.smem_len = fb_len;
info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
if (!info->screen_base)
- return -ENOMEM;
+ goto err_nomem;

dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
info->fix.smem_len / 1024, info->fix.smem_start);

return 0;
+
+err_nomem:
+ ret = -ENOMEM;
+err_disable_device:
+ pci_disable_device(dev);
+ return ret;
}

static int parse_panel_option(struct fb_info *info)
--
2.26.2
\
 
 \ /
  Last update: 2020-06-05 18:17    [W:0.179 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site