All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
@ 2020-06-03  9:25 ` Chuhong Yuan
  0 siblings, 0 replies; 9+ messages in thread
From: Chuhong Yuan @ 2020-06-03  9:25 UTC (permalink / raw)
  Cc: Andres Salomon, Bartlomiej Zolnierkiewicz, Adrian Bunk,
	David Vrabel, James Simmons, Andrew Morton, linux-geode,
	dri-devel, linux-fbdev, linux-kernel, Chuhong Yuan

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>
---
 drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/drivers/video/fbdev/geode/gx1fb_core.c b/drivers/video/fbdev/geode/gx1fb_core.c
index 5d34d89fb665..c9465542204a 100644
--- a/drivers/video/fbdev/geode/gx1fb_core.c
+++ b/drivers/video/fbdev/geode/gx1fb_core.c
@@ -208,29 +208,44 @@ 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;
 	par->vid_regs = pci_ioremap_bar(dev, 0);
-	if (!par->vid_regs)
-		return -ENOMEM;
+	if (!par->vid_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	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;
+	}
 	par->dc_regs = ioremap(gx_base + 0x8300, 0x100);
-	if (!par->dc_regs)
-		return -ENOMEM;
+	if (!par->dc_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	if ((fb_len = gx1_frame_buffer_size()) < 0)
-		return -ENOMEM;
+	if ((fb_len = gx1_frame_buffer_size()) < 0) {
+		ret = -ENOMEM;
+		goto err;
+	}
 	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;
+	if (!info->screen_base) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
 	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:
+	pci_disable_device(dev);
+	return ret;
 }
 
 static int parse_panel_option(struct fb_info *info)
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
@ 2020-06-03  9:25 ` Chuhong Yuan
  0 siblings, 0 replies; 9+ messages in thread
From: Chuhong Yuan @ 2020-06-03  9:25 UTC (permalink / raw)
  Cc: Andrew Morton, linux-fbdev, Bartlomiej Zolnierkiewicz,
	linux-kernel, Chuhong Yuan, linux-geode, dri-devel, Adrian Bunk,
	Andres Salomon, David Vrabel

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>
---
 drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/drivers/video/fbdev/geode/gx1fb_core.c b/drivers/video/fbdev/geode/gx1fb_core.c
index 5d34d89fb665..c9465542204a 100644
--- a/drivers/video/fbdev/geode/gx1fb_core.c
+++ b/drivers/video/fbdev/geode/gx1fb_core.c
@@ -208,29 +208,44 @@ 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;
 	par->vid_regs = pci_ioremap_bar(dev, 0);
-	if (!par->vid_regs)
-		return -ENOMEM;
+	if (!par->vid_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	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;
+	}
 	par->dc_regs = ioremap(gx_base + 0x8300, 0x100);
-	if (!par->dc_regs)
-		return -ENOMEM;
+	if (!par->dc_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	if ((fb_len = gx1_frame_buffer_size()) < 0)
-		return -ENOMEM;
+	if ((fb_len = gx1_frame_buffer_size()) < 0) {
+		ret = -ENOMEM;
+		goto err;
+	}
 	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;
+	if (!info->screen_base) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
 	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:
+	pci_disable_device(dev);
+	return ret;
 }
 
 static int parse_panel_option(struct fb_info *info)
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
@ 2020-06-03  9:25 ` Chuhong Yuan
  0 siblings, 0 replies; 9+ messages in thread
From: Chuhong Yuan @ 2020-06-03  9:25 UTC (permalink / raw)
  Cc: Andrew Morton, linux-fbdev, Bartlomiej Zolnierkiewicz,
	linux-kernel, Chuhong Yuan, linux-geode, dri-devel, Adrian Bunk,
	Andres Salomon, David Vrabel

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>
---
 drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/drivers/video/fbdev/geode/gx1fb_core.c b/drivers/video/fbdev/geode/gx1fb_core.c
index 5d34d89fb665..c9465542204a 100644
--- a/drivers/video/fbdev/geode/gx1fb_core.c
+++ b/drivers/video/fbdev/geode/gx1fb_core.c
@@ -208,29 +208,44 @@ 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;
 	par->vid_regs = pci_ioremap_bar(dev, 0);
-	if (!par->vid_regs)
-		return -ENOMEM;
+	if (!par->vid_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	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;
+	}
 	par->dc_regs = ioremap(gx_base + 0x8300, 0x100);
-	if (!par->dc_regs)
-		return -ENOMEM;
+	if (!par->dc_regs) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
-	if ((fb_len = gx1_frame_buffer_size()) < 0)
-		return -ENOMEM;
+	if ((fb_len = gx1_frame_buffer_size()) < 0) {
+		ret = -ENOMEM;
+		goto err;
+	}
 	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;
+	if (!info->screen_base) {
+		ret = -ENOMEM;
+		goto err;
+	}
 
 	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:
+	pci_disable_device(dev);
+	return ret;
 }
 
 static int parse_panel_option(struct fb_info *info)
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() in gx1fb_map_video_memory()
  2020-06-03  9:25 ` Chuhong Yuan
  (?)
@ 2020-06-03 16:48 ` Markus Elfring
  -1 siblings, 0 replies; 9+ messages in thread
From: Markus Elfring @ 2020-06-03 16:48 UTC (permalink / raw)
  To: Chuhong Yuan, dri-devel, linux-fbdev, linux-geode
  Cc: Andrew Morton, Bartlomiej Zolnierkiewicz, Adrian Bunk,
	Andres Salomon, David Vrabel, James Simmons, linux-kernel

> Add the missed function call to fix the bug.
> +++ b/drivers/video/fbdev/geode/gx1fb_core.c
> @@ -208,29 +208,44 @@  static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
>  	return 0;
> +
> +err:
> +	pci_disable_device(dev);
> +	return ret;
>  }
…

I suggest to use more descriptive labels so that the exception handling
can be improved accordingly.

 	return 0;
+
+e_nomem:
+	ret = -ENOMEM;
+disable_device:
+	pci_disable_device(dev);
+	return ret;
 }


Regards,
Markus

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() in gx1fb_map_video_memory()
@ 2020-06-03 16:48 ` Markus Elfring
  0 siblings, 0 replies; 9+ messages in thread
From: Markus Elfring @ 2020-06-03 16:48 UTC (permalink / raw)
  To: Chuhong Yuan, dri-devel, linux-fbdev, linux-geode
  Cc: Andrew Morton, Bartlomiej Zolnierkiewicz, linux-kernel,
	Adrian Bunk, Andres Salomon, David Vrabel

> Add the missed function call to fix the bug.
> +++ b/drivers/video/fbdev/geode/gx1fb_core.c
> @@ -208,29 +208,44 @@  static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
>  	return 0;
> +
> +err:
> +	pci_disable_device(dev);
> +	return ret;
>  }
…

I suggest to use more descriptive labels so that the exception handling
can be improved accordingly.

 	return 0;
+
+e_nomem:
+	ret = -ENOMEM;
+disable_device:
+	pci_disable_device(dev);
+	return ret;
 }


Regards,
Markus

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() in gx1fb_map_video_memory()
@ 2020-06-03 16:48 ` Markus Elfring
  0 siblings, 0 replies; 9+ messages in thread
From: Markus Elfring @ 2020-06-03 16:48 UTC (permalink / raw)
  To: Chuhong Yuan, dri-devel, linux-fbdev, linux-geode
  Cc: Andrew Morton, Bartlomiej Zolnierkiewicz, linux-kernel,
	Adrian Bunk, Andres Salomon, David Vrabel

> Add the missed function call to fix the bug.
> +++ b/drivers/video/fbdev/geode/gx1fb_core.c
> @@ -208,29 +208,44 @@  static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
>  	return 0;
> +
> +err:
> +	pci_disable_device(dev);
> +	return ret;
>  }
…

I suggest to use more descriptive labels so that the exception handling
can be improved accordingly.

 	return 0;
+
+e_nomem:
+	ret = -ENOMEM;
+disable_device:
+	pci_disable_device(dev);
+	return ret;
 }


Regards,
Markus
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
  2020-06-03  9:25 ` Chuhong Yuan
  (?)
@ 2020-06-04  8:22   ` Pekka Paalanen
  -1 siblings, 0 replies; 9+ messages in thread
From: Pekka Paalanen @ 2020-06-04  8:22 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: Andrew Morton, linux-fbdev, Bartlomiej Zolnierkiewicz,
	linux-kernel, linux-geode, dri-devel, Adrian Bunk,
	Andres Salomon, David Vrabel

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

On Wed,  3 Jun 2020 17:25:47 +0800
Chuhong Yuan <hslester96@gmail.com> wrote:

> 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>
> ---
>  drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
>  1 file changed, 26 insertions(+), 11 deletions(-)

Hi,

there is a typo in the patch subject, the driver seems to be called
geode, not geocode.


Thanks,
pq

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
@ 2020-06-04  8:22   ` Pekka Paalanen
  0 siblings, 0 replies; 9+ messages in thread
From: Pekka Paalanen @ 2020-06-04  8:22 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: Andrew Morton, linux-fbdev, Bartlomiej Zolnierkiewicz,
	linux-kernel, dri-devel, linux-geode, Andres Salomon,
	David Vrabel, Adrian Bunk

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

On Wed,  3 Jun 2020 17:25:47 +0800
Chuhong Yuan <hslester96@gmail.com> wrote:

> 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>
> ---
>  drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
>  1 file changed, 26 insertions(+), 11 deletions(-)

Hi,

there is a typo in the patch subject, the driver seems to be called
geode, not geocode.


Thanks,
pq

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory()
@ 2020-06-04  8:22   ` Pekka Paalanen
  0 siblings, 0 replies; 9+ messages in thread
From: Pekka Paalanen @ 2020-06-04  8:22 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: Andrew Morton, linux-fbdev, Bartlomiej Zolnierkiewicz,
	linux-kernel, dri-devel, linux-geode, Andres Salomon,
	David Vrabel, Adrian Bunk


[-- Attachment #1.1: Type: text/plain, Size: 682 bytes --]

On Wed,  3 Jun 2020 17:25:47 +0800
Chuhong Yuan <hslester96@gmail.com> wrote:

> 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>
> ---
>  drivers/video/fbdev/geode/gx1fb_core.c | 37 ++++++++++++++++++--------
>  1 file changed, 26 insertions(+), 11 deletions(-)

Hi,

there is a typo in the patch subject, the driver seems to be called
geode, not geocode.


Thanks,
pq

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-06-04  8:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-03  9:25 [PATCH] fbdev: geocode: Add the missed pci_disable_device() for gx1fb_map_video_memory() Chuhong Yuan
2020-06-03  9:25 ` Chuhong Yuan
2020-06-03  9:25 ` Chuhong Yuan
2020-06-04  8:22 ` Pekka Paalanen
2020-06-04  8:22   ` Pekka Paalanen
2020-06-04  8:22   ` Pekka Paalanen
2020-06-03 16:48 [PATCH] fbdev: geocode: Add the missed pci_disable_device() in gx1fb_map_video_memory() Markus Elfring
2020-06-03 16:48 ` Markus Elfring
2020-06-03 16:48 ` Markus Elfring

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.