Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361225
b: refs/heads/master
c: 5771a80
h: refs/heads/master
i:
  361223: 8d8a6f6
v: v3
  • Loading branch information
Tony Prisk authored and Greg Kroah-Hartman committed Mar 12, 2013
1 parent 97ba91f commit fb68dfa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09081e5b47f6842669bb645e015deedf191244f4
refs/heads/master: 5771a8051d5ebaac0651a957885f55b5f6221a02
9 changes: 1 addition & 8 deletions trunk/drivers/tty/serial/vt8500_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,14 +611,7 @@ static int vt8500_serial_probe(struct platform_device *pdev)
vt8500_port->uart.dev = &pdev->dev;
vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;

vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0);
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 */
pr_warn("%s: serial clock source not specified\n", __func__);
vt8500_port->uart.uartclk = 24000000;
}
vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk);

snprintf(vt8500_port->name, sizeof(vt8500_port->name),
"VT8500 UART%d", pdev->id);
Expand Down

0 comments on commit fb68dfa

Please sign in to comment.