From af08bdf3c5952d016341aed7387f249f97ae3ed6 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Mon, 27 Mar 2006 01:17:33 -0800
Subject: [PATCH] --- yaml --- r: 24375 b: refs/heads/master c:
 3d5b191fff144634a04800e610b7ad0c1aefa6ed h: refs/heads/master i:   24373:
 7b68591fce1e43dbc0f1d84ec7d52b4e86e0a63f   24371:
 87b83c0d397394567e3148e66a669c7eb53bc481   24367:
 598b51c696ec64933fc53cd9f1ed7103348a99cb v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/nvidia/nv_i2c.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4da31ed46b8a..8f96dc1741e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ff7727d2a92f8b99cc709b827859da5d3c46a8a
+refs/heads/master: 3d5b191fff144634a04800e610b7ad0c1aefa6ed
diff --git a/trunk/drivers/video/nvidia/nv_i2c.c b/trunk/drivers/video/nvidia/nv_i2c.c
index bd9eca05e146..1edb1c432b75 100644
--- a/trunk/drivers/video/nvidia/nv_i2c.c
+++ b/trunk/drivers/video/nvidia/nv_i2c.c
@@ -218,8 +218,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
 		}
 	}
 
-	if (out_edid)
-		*out_edid = edid;
+	*out_edid = edid;
 
 	return (edid) ? 0 : 1;
 }