Commit 474ff6b8 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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

omapdss fixes for 3.7-rc

Conflicts:
	drivers/video/omap2/dss/dss.c
parents 9b76c9cd 8ad9375f

drivers/video/omap2/dss/dss.c

+9 −5
Original line number Diff line number Diff line
@@ -753,12 +753,16 @@ static int dss_get_clocks(void) 


	dss.dss_clk = clk;



	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;

drivers/video/omap2/omapfb/omapfb-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}