drm/qxl: Complete exception handling in qxl_device_init()

Commit Message

Markus Elfring Nov. 7, 2019, 5:18 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Thu, 7 Nov 2019 18:05:08 +0100

A coccicheck run provided information like the following.

drivers/gpu/drm/qxl/qxl_kms.c:295:1-7: ERROR: missing iounmap;
ioremap on line 178 and execution via conditional on line 185

Generated by: scripts/coccinelle/free/iounmap.cocci

A jump target was specified in an if branch. The corresponding function
call did not release the desired system resource then.
Thus use the label “rom_unmap” instead to fix the exception handling
for this function implementation.

Fixes: 5043348a4969ae1661c008efe929abd0d76e3792 ("drm: qxl: Fix error handling at qxl_device_init")
Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/gpu/drm/qxl/qxl_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.24.0

Comments

Gerd Hoffmann Nov. 29, 2019, 12:24 p.m. UTC | #1

On Thu, Nov 07, 2019 at 06:18:14PM +0100, Markus Elfring wrote:
> From: Markus Elfring <[e-mail]>
> Date: Thu, 7 Nov 2019 18:05:08 +0100
> 
> A coccicheck run provided information like the following.
> 
> drivers/gpu/drm/qxl/qxl_kms.c:295:1-7: ERROR: missing iounmap;
> ioremap on line 178 and execution via conditional on line 185
> 
> Generated by: scripts/coccinelle/free/iounmap.cocci
> 
> A jump target was specified in an if branch. The corresponding function
> call did not release the desired system resource then.
> Thus use the label “rom_unmap” instead to fix the exception handling
> for this function implementation.
> 
> Fixes: 5043348a4969ae1661c008efe929abd0d76e3792 ("drm: qxl: Fix error handling at qxl_device_init")
> Signed-off-by: Markus Elfring <[e-mail]>

Pushed to drm-misc-next.

thanks,
  Gerd

Patch

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index 611cbe7aee69..bfc1631093e9 100644
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -184,7 +184,7 @@  int qxl_device_init(struct qxl_device *qdev,

 	if (!qxl_check_device(qdev)) {
 		r = -ENODEV;
-		goto surface_mapping_free;
+		goto rom_unmap;
 	}

 	r = qxl_bo_init(qdev);