Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1487170

[PATCH 3/6] GPU-DRM-GMA500: Move a variable assignment in mid_get_vbt_data_r10()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 20 Sep 2016 10:32:12 +0200

One local variable was set to an error code before a concrete
error situation was detected. Thus move the corresponding assignment into
an if branch to indicate a software failure there.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/gpu/drm/gma500/mid_bios.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index cf4e605..3caee42 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -230,7 +230,7 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr)
 	struct gct_r10 *gct;
 	struct oaktrail_timing_info *dp_ti = &dev_priv->gct_data.DTD;
 	struct gct_r10_timing_info *ti;
-	int ret = -1;
+	int ret;
 
 	if (read_vbt_r10(addr, &vbt))
 		return -1;
@@ -241,8 +241,10 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr)
 
 	gct_virtual = ioremap(addr + sizeof(vbt),
 			sizeof(*gct) * vbt.panel_count);
-	if (!gct_virtual)
+	if (!gct_virtual) {
+		ret = -1;
 		goto free_gct;
+	}
 	memcpy_fromio(gct, gct_virtual, sizeof(*gct));
 	iounmap(gct_virtual);
 
-- 
2.10.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] GPU-DRM-GMA500: Fine-tuning for two function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
  [PATCH 2/6] GPU-DRM-GMA500: Rename a jump label in  mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
    Re: [PATCH 2/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data_r10() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
  [PATCH 3/6] GPU-DRM-GMA500: Move a variable assignment in  mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
  [PATCH 4/6] GPU-DRM-GMA500: Fix indentation for a function call  parameter in mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
  [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision  mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
    Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
      Re: GPU-DRM-GMA500: One error message less for a GCT revision  mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 12:40 +0200
      Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT  revision mismatch in mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 13:00 +0200
        Re: GPU-DRM-GMA500: One error message less for a GCT revision  mismatch in mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 13:20 +0200
          Re: GPU-DRM-GMA500: One error message less for a GCT revision  mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 13:40 +0200
        Re: GPU-DRM-GMA500: One error message less for a GCT revision  mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 13:20 +0200
        Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 14:10 +0200
          Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT  revision mismatch in mid_get_vbt_data() Patrik Jakobsson <patrik.r.jakobsson@gmail.com> - 2016-09-20 22:30 +0200
  [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
    Re: [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
      Re: [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in  mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 14:50 +0200

csiph-web