aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 13:32:19 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 13:32:19 -0500
commit2e824ad59f678a1ff920144fda9b7dd0815fc010 (patch)
tree616d4c0d4e815493b7e7ff9842793a1b45c66ac9
parentf97b8954953ba8e692dbb92d99e26b721f7068cd (diff)
parenta960d5dc71102d33f257cbc26d87b15015586672 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdio_uart: fix sign of paramter status in sdio_uart_receive_chars()
-rw-r--r--drivers/mmc/card/sdio_uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index d552de683110..eeea84c309e6 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -386,7 +386,7 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)
386 sdio_out(port, UART_IER, port->ier); 386 sdio_out(port, UART_IER, port->ier);
387} 387}
388 388
389static void sdio_uart_receive_chars(struct sdio_uart_port *port, int *status) 389static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status)
390{ 390{
391 struct tty_struct *tty = port->tty; 391 struct tty_struct *tty = port->tty;
392 unsigned int ch, flag; 392 unsigned int ch, flag;