summary refs log tree commit diff
diff options
context:
space:
mode:
authoraxel lin <axel.lin@gmail.com>2011-01-21 11:18:06 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-01-25 15:09:19 +0900
commite88e43b0c564864c883103483bad6219f77dfb52 (patch)
tree123c3d621080dd089242635d23e41de371b5f40e
parent360c202bebfecbedb129c07361ae8a738552eae3 (diff)
downloadlinux-e88e43b0c564864c883103483bad6219f77dfb52.tar.gz
video: pxa168fb: remove a redundant pxa168fb_check_var call
Current implementation calls pxa168fb_check_var twice in pxa168fb_probe.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/pxa168fb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index cea6403ae71c..35f61dd0cb3a 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -701,16 +701,12 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
 	 */
 	pxa168fb_init_mode(info, mi);
 
-	ret = pxa168fb_check_var(&info->var, info);
-	if (ret)
-		goto failed_free_fbmem;
-
 	/*
 	 * Fill in sane defaults.
 	 */
 	ret = pxa168fb_check_var(&info->var, info);
 	if (ret)
-		goto failed;
+		goto failed_free_fbmem;
 
 	/*
 	 * enable controller clock