summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxel lin <axel.lin@gmail.com>2011-01-20 03:50:51 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-01-25 15:09:13 +0900
commit360c202bebfecbedb129c07361ae8a738552eae3 (patch)
tree9e1e931ee17e35362e2b429fbdcf2c993f5322ff
parent0b7f1cc79d61427961e311c6a21f528bdb226e40 (diff)
downloadlinux-stable-360c202bebfecbedb129c07361ae8a738552eae3.tar.gz
linux-stable-360c202bebfecbedb129c07361ae8a738552eae3.tar.bz2
linux-stable-360c202bebfecbedb129c07361ae8a738552eae3.zip
video: da8xx-fb: fix fb_probe error path
Current implementation puts CONFIG_CPU_FREQ at wrong place, CONFIG_CPU_FREQ is for lcd_da8xx_cpufreq_deregister not for unregister_framebuffer. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/da8xx-fb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index c265aed09e04..520047ac6e3e 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -1092,9 +1092,10 @@ static int __init fb_probe(struct platform_device *device)
irq_freq:
#ifdef CONFIG_CPU_FREQ
+ lcd_da8xx_cpufreq_deregister(par);
+#endif
err_cpu_freq:
unregister_framebuffer(da8xx_fb_info);
-#endif
err_dealloc_cmap:
fb_dealloc_cmap(&da8xx_fb_info->cmap);