From db4cbdb389d7748e5281de4f8558056dca537c6a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 29 Oct 2012 15:19:57 +0000 Subject: [PATCH] --- yaml --- r: 338398 b: refs/heads/master c: bebe73e31d98845c8b63e624c25a5da2d819345a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c5c990fc0c92..d5e07695cc14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15a12e83da812e9116577d46b048923587da5000 +refs/heads/master: bebe73e31d98845c8b63e624c25a5da2d819345a diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 0fcfd98a9566..477e0790ddf2 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -2329,15 +2329,15 @@ struct tty_driver *uart_console_device(struct console *co, int *index) static ssize_t uart_get_attr_uartclk(struct device *dev, struct device_attribute *attr, char *buf) { - int ret; + struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); struct uart_state *state = container_of(port, struct uart_state, port); - mutex_lock(&state->port.mutex); - ret = snprintf(buf, PAGE_SIZE, "%d\n", state->uart_port->uartclk); - mutex_unlock(&state->port.mutex); + mutex_lock(&port->mutex); + uart_get_info(port, state, &tmp); + mutex_unlock(&port->mutex); - return ret; + return snprintf(buf, PAGE_SIZE, "%d\n", tmp.baud_base * 16); } static DEVICE_ATTR(uartclk, S_IRUSR | S_IRGRP, uart_get_attr_uartclk, NULL);