diff mbox

[i-g-t] lib: fix signed/unsigned comparison issues

Message ID 1391704314-26068-1-git-send-email-thomas.wood@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Wood Feb. 6, 2014, 4:31 p.m. UTC 
Store the result of set_vt_mode as a signed value so that errors can be
caught correctly.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/igt_kms.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Daniel Vetter Feb. 6, 2014, 5:33 p.m. UTC | #1 
On Thu, Feb 06, 2014 at 04:31:54PM +0000, Thomas Wood wrote:
> Store the result of set_vt_mode as a signed value so that errors can be
> caught correctly.
> 
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>

Both merged, thanks.
-Daniel

> ---
>  lib/igt_kms.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 3960d24..5f341ff 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -620,15 +620,16 @@ static void restore_vt_mode_at_exit(int sig)
>  
>  void igt_set_vt_graphics_mode(void)
>  {
> +	long ret;
> +
>  	igt_install_exit_handler(restore_vt_mode_at_exit);
>  
>  	igt_disable_exit_handler();
> -	orig_vt_mode = set_vt_mode(KD_GRAPHICS);
> -	if (orig_vt_mode < 0)
> -		orig_vt_mode = -1UL;
> +	ret = set_vt_mode(KD_GRAPHICS);
>  	igt_enable_exit_handler();
>  
> -	igt_assert(orig_vt_mode >= 0);
> +	igt_assert(ret >= 0);
> +	orig_vt_mode = ret;
>  }
>  
>  int kmstest_get_connector_default_mode(int drm_fd, drmModeConnector *connector,
> -- 
> 1.8.5.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 3960d24..5f341ff 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -620,15 +620,16 @@  static void restore_vt_mode_at_exit(int sig)
 
 void igt_set_vt_graphics_mode(void)
 {
+	long ret;
+
 	igt_install_exit_handler(restore_vt_mode_at_exit);
 
 	igt_disable_exit_handler();
-	orig_vt_mode = set_vt_mode(KD_GRAPHICS);
-	if (orig_vt_mode < 0)
-		orig_vt_mode = -1UL;
+	ret = set_vt_mode(KD_GRAPHICS);
 	igt_enable_exit_handler();
 
-	igt_assert(orig_vt_mode >= 0);
+	igt_assert(ret >= 0);
+	orig_vt_mode = ret;
 }
 
 int kmstest_get_connector_default_mode(int drm_fd, drmModeConnector *connector,