shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux

Browse Source 
omapdss fixes for 3.7-rc

Conflicts:
	drivers/video/omap2/dss/dss.c
This commit is contained in:
Tomi Valkeinen
2012-11-26 10:26:29 +02:00
parent 9b76c9cdec 8ad9375f8b
commit 474ff6b8a7
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/omap2/dss/dss.c
View File

@@ -753,11 +753,15 @@ static int dss_get_clocks(void)
dss.dss_clk = clk;
clk = clk_get(NULL, dss.feat->clk_name);
if (IS_ERR(clk)) {
DSSERR("Failed to get %s\n", dss.feat->clk_name);
r = PTR_ERR(clk);
goto err;
if (dss.feat->clk_name) {
clk = clk_get(NULL, dss.feat->clk_name);
if (IS_ERR(clk)) {
DSSERR("Failed to get %s\n", dss.feat->clk_name);
r = PTR_ERR(clk);
goto err;
}
} else {
clk = NULL;
}
dss.dpll4_m4_ck = clk;

2
drivers/video/omap2/omapfb/omapfb-ioctl.c
View File

@@ -787,7 +787,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
case OMAPFB_WAITFORVSYNC:
DBG("ioctl WAITFORVSYNC\n");
if (!display && !display->output && !display->output->manager) {
if (!display || !display->output || !display->output->manager) {
r = -EINVAL;
break;
}