From b7134e22b23a556e188d9bef8fcb8b74ae138f64 Mon Sep 17 00:00:00 2001 From: axel lin Date: Fri, 21 Jan 2011 11:18:06 +0000 Subject: [PATCH] --- yaml --- r: 232365 b: refs/heads/master c: e88e43b0c564864c883103483bad6219f77dfb52 h: refs/heads/master i: 232363: 14ca3d5095c390f2f1d9a4c7c533bc2177195d3d v: v3 --- [refs] | 2 +- trunk/drivers/video/pxa168fb.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bb8af1d1ded3..03a504d9482a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 360c202bebfecbedb129c07361ae8a738552eae3 +refs/heads/master: e88e43b0c564864c883103483bad6219f77dfb52 diff --git a/trunk/drivers/video/pxa168fb.c b/trunk/drivers/video/pxa168fb.c index cea6403ae71c..35f61dd0cb3a 100644 --- a/trunk/drivers/video/pxa168fb.c +++ b/trunk/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