From 1e303c429633470e3a2ccb3d6a3f11d2247fd3d8 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Wed, 4 Nov 2009 09:42:52 +0100
Subject: [PATCH] --- yaml --- r: 174487 b: refs/heads/master c:
 cda6be1ce27d721a88cb90543a1e6d0f41baeaa4 h: refs/heads/master i:   174485:
 903d8af24c1ae911ba343faf022865566a71e1d2   174483:
 e7f0d52adbc72b07149cedb1c9aba989d6100de9   174479:
 b6ff25b224ea209ae787ca16fcb5a334c89ac948 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/drm_fb_helper.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2cc979d46ddc..4de7578bc25f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 731b5a15a3b1474a41c2ca29b4c32b0f21bc852e
+refs/heads/master: cda6be1ce27d721a88cb90543a1e6d0f41baeaa4
diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c
index ea336d2f6529..e812babe2122 100644
--- a/trunk/drivers/gpu/drm/drm_fb_helper.c
+++ b/trunk/drivers/gpu/drm/drm_fb_helper.c
@@ -602,7 +602,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 	struct drm_framebuffer *fb = fb_helper->fb;
 	int depth;
 
-	if (var->pixclock == -1 || !var->pixclock)
+	if (var->pixclock != 0)
 		return -EINVAL;
 
 	/* Need to resize the fb object !!! */
@@ -694,7 +694,7 @@ int drm_fb_helper_set_par(struct fb_info *info)
 	int ret;
 	int i;
 
-	if (var->pixclock != -1) {
+	if (var->pixclock != 0) {
 		DRM_ERROR("PIXEL CLCOK SET\n");
 		return -EINVAL;
 	}
@@ -907,7 +907,7 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev,
 	fb_helper->fb = fb;
 
 	if (new_fb) {
-		info->var.pixclock = -1;
+		info->var.pixclock = 0;
 		if (register_framebuffer(info) < 0)
 			return -EINVAL;
 	} else {