summaryrefslogtreecommitdiff
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2011-11-21 15:43:28 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-26 20:10:13 -0800
commit514f31d19ed6d001cac37af0b4a3f61b07969d59 (patch)
tree1310fb416f7f86d0f89939eac954cf5992617c06 /drivers/tty/serial
parentdd7c7c3f69291baa488b8a50db683d5fbf44166a (diff)
downloadlinux-3.10-514f31d19ed6d001cac37af0b4a3f61b07969d59.tar.gz
linux-3.10-514f31d19ed6d001cac37af0b4a3f61b07969d59.tar.bz2
linux-3.10-514f31d19ed6d001cac37af0b4a3f61b07969d59.zip
OMAP: UART: fix the return type of check_modem_status
The function check_modem_status returns an int currently it is stored in a char. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/omap-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 5e713d3ef1f..f2a1380ed67 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -399,7 +399,7 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
static unsigned int serial_omap_get_mctrl(struct uart_port *port)
{
struct uart_omap_port *up = (struct uart_omap_port *)port;
- unsigned char status;
+ unsigned int status;
unsigned int ret = 0;
status = check_modem_status(up);