From: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon, 27 Mar 2006 09:17:33 +0000 (-0800)
Subject: [PATCH] nvidiafb: Remove NULL check #2
X-Git-Tag: v2.6.17-rc1~326
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5b191fff144634a04800e610b7ad0c1aefa6ed;p=linux-2.6

[PATCH] nvidiafb: Remove NULL check #2

Remove unnecessary NULL check.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index bd9eca05e1..1edb1c432b 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/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;
 }