git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
nuc900fb.c
diff --git
a/drivers/video/nuc900fb.c
b/drivers/video/nuc900fb.c
index
62498bd
..
f838d9e
100644
(file)
--- a/
drivers/video/nuc900fb.c
+++ b/
drivers/video/nuc900fb.c
@@
-696,6
+696,8
@@
static int nuc900fb_remove(struct platform_device *pdev)
nuc900fb_stop_lcd(fbinfo);
msleep(1);
nuc900fb_stop_lcd(fbinfo);
msleep(1);
+ unregister_framebuffer(fbinfo);
+ nuc900fb_cpufreq_deregister(fbi);
nuc900fb_unmap_video_memory(fbinfo);
iounmap(fbi->io);
nuc900fb_unmap_video_memory(fbinfo);
iounmap(fbi->io);
@@
-723,7
+725,7
@@
static int nuc900fb_suspend(struct platform_device *dev, pm_message_t state)
struct fb_info *fbinfo = platform_get_drvdata(dev);
struct nuc900fb_info *info = fbinfo->par;
struct fb_info *fbinfo = platform_get_drvdata(dev);
struct nuc900fb_info *info = fbinfo->par;
- nuc900fb_stop_lcd();
+ nuc900fb_stop_lcd(
fbinfo
);
msleep(1);
clk_disable(info->clk);
return 0;
msleep(1);
clk_disable(info->clk);
return 0;
@@
-740,7
+742,7
@@
static int nuc900fb_resume(struct platform_device *dev)
msleep(1);
nuc900fb_init_registers(fbinfo);
msleep(1);
nuc900fb_init_registers(fbinfo);
- nuc900fb_activate_var(
bf
info);
+ nuc900fb_activate_var(
fb
info);
return 0;
}
return 0;
}