Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

torvalds · torvalds · commit edf15b4d4b01 · 2015-08-11T10:23:59.000-07:00
Pull fbdev fixes from Tomi Valkeinen:
 - fix display regression on Versatile boards
 - fix OF node refcount bugs on omapdss
 - fix WARN about clock prepare on pxa3xx_gcu
 - fix mem leak in videomode helpers
 - fix fbconsole related boot problem on sun7i-a20-olinuxino-micro

* tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  fbcon: unconditionally initialize cursor blink interval
  video: Fix possible leak in of_get_videomode()
  video: fbdev: pxa3xx_gcu: prepare the clocks
  OMAPDSS: Fix omap_dss_find_output_by_port_node() port refcount decrement
  OMAPDSS: Fix node refcount leak in omapdss_of_get_next_port()
  fbdev: select versatile helpers for the integrator
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
@@ -1306,10 +1306,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
 	int y;
  	int c = scr_readw((u16 *) vc->vc_pos);
 
+	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
+
 	if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
 		return;
 
-	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
 	if (vc->vc_cursor_type & 0x10)
 		fbcon_del_cursor_timer(info);
 	else
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
@@ -298,7 +298,7 @@ config FB_ARMCLCD
 
 # Helper logic selected only by the ARM Versatile platform family.
 config PLAT_VERSATILE_CLCD
-	def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS
+	def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_INTEGRATOR
 	depends on ARM
 	depends on FB_ARMCLCD && FB=y
 
diff --git a/drivers/video/fbdev/omap2/dss/dss-of.c b/drivers/video/fbdev/omap2/dss/dss-of.c
@@ -60,6 +60,8 @@ omapdss_of_get_next_port(const struct device_node *parent,
 			}
 			prev = port;
 		} while (of_node_cmp(port->name, "port") != 0);
+
+		of_node_put(ports);
 	}
 
 	return port;
@@ -94,7 +96,7 @@ struct device_node *dss_of_port_get_parent_device(struct device_node *port)
 	if (!port)
 		return NULL;
 
-	np = of_get_next_parent(port);
+	np = of_get_parent(port);
 
 	for (i = 0; i < 2 && np; ++i) {
 		struct property *prop;
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -653,7 +653,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
 		goto err_free_dma;
 	}
 
-	ret = clk_enable(priv->clk);
+	ret = clk_prepare_enable(priv->clk);
 	if (ret < 0) {
 		dev_err(dev, "failed to enable clock\n");
 		goto err_misc_deregister;
@@ -685,7 +685,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
 	misc_deregister(&priv->misc_dev);
 
 err_disable_clk:
-	clk_disable(priv->clk);
+	clk_disable_unprepare(priv->clk);
 
 	return ret;
 }
diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
@@ -44,11 +44,9 @@ int of_get_videomode(struct device_node *np, struct videomode *vm,
 		index = disp->native_mode;
 
 	ret = videomode_from_timings(disp, vm, index);
-	if (ret)
-		return ret;
 
 	display_timings_release(disp);
 
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(of_get_videomode);

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ omapdss_of_get_next_port(const struct device_node *parent,`
`60`	`60`	`}`
`61`	`61`	`prev = port;`
`62`	`62`	`} while (of_node_cmp(port->name, "port") != 0);`
	`63`	`+`
	`64`	`+ of_node_put(ports);`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`return port;`
`@@ -94,7 +96,7 @@ struct device_node dss_of_port_get_parent_device(struct device_node port)`
`94`	`96`	`if (!port)`
`95`	`97`	`return NULL;`
`96`	`98`
`97`		`- np = of_get_next_parent(port);`
	`99`	`+ np = of_get_parent(port);`
`98`	`100`
`99`	`101`	`for (i = 0; i < 2 && np; ++i) {`
`100`	`102`	`struct property *prop;`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)`
`653`	`653`	`goto err_free_dma;`
`654`	`654`	`}`
`655`	`655`
`656`		`- ret = clk_enable(priv->clk);`
	`656`	`+ ret = clk_prepare_enable(priv->clk);`
`657`	`657`	`if (ret < 0) {`
`658`	`658`	`dev_err(dev, "failed to enable clock\n");`
`659`	`659`	`goto err_misc_deregister;`
`@@ -685,7 +685,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)`
`685`	`685`	`misc_deregister(&priv->misc_dev);`
`686`	`686`
`687`	`687`	`err_disable_clk:`
`688`		`- clk_disable(priv->clk);`
	`688`	`+ clk_disable_unprepare(priv->clk);`
`689`	`689`
`690`	`690`	`return ret;`
`691`	`691`	`}`