---

yaml --- r: 348903 b: refs/heads/master c: a6dd114 h: refs/heads/master i: 348901: 77f2370 348899: f058f99 348895: 6d89fae v: v3
git-mirror · Jan 16, 2013 · 3bb9a4f · 3bb9a4f
1 parent 10bc329
commit 3bb9a4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87b8bed2ce9394870a87e4fb2aef6752b2bd837d
+refs/heads/master: a6dd114e16cbc4410049a90a8a67b967333d108d
diff --git a/trunk/drivers/tty/serial/vt8500_serial.c b/trunk/drivers/tty/serial/vt8500_serial.c
@@ -604,7 +604,7 @@ static int vt8500_serial_probe(struct platform_device *pdev)
 	vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
 
 	vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0);
-	if (vt8500_port->clk) {
+	if (!IS_ERR(vt8500_port->clk)) {
 		vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk);
 	} else {
 		/* use the default of 24Mhz if not specified and warn */