summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-03-27 11:17:33 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 18:44:56 +0200
commit3d5b191fff144634a04800e610b7ad0c1aefa6ed (patch)
treea4fe1e1adaf9c80bfa1c46f1cebbe4ca7f11d01b /drivers
parent[PATCH] nvidiafb: Remove NULL check (diff)
downloadlinux-3d5b191fff144634a04800e610b7ad0c1aefa6ed.tar.xz
linux-3d5b191fff144634a04800e610b7ad0c1aefa6ed.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/nvidia/nv_i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index bd9eca05e146..1edb1c432b75 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;
}