]> err.no Git - linux-2.6/commitdiff
sdio_uart: Fix SDIO break control to now return success or an error
authorDavid Howells <dhowells@redhat.com>
Thu, 10 Jul 2008 11:28:48 +0000 (12:28 +0100)
committerPierre Ossman <drzeus@drzeus.cx>
Tue, 15 Jul 2008 13:47:04 +0000 (15:47 +0200)
This is a consequence of patch 9ea761bfef52c116fed4715d4043392c2503fe6a.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
drivers/mmc/card/sdio_uart.c

index eeea84c309e691c8a7c838b527b95c7ce50c296c..78ad48718ab028e61b1d77d83e29de8efbe9930c 100644 (file)
@@ -885,12 +885,14 @@ static void sdio_uart_set_termios(struct tty_struct *tty, struct ktermios *old_t
        sdio_uart_release_func(port);
 }
 
-static void sdio_uart_break_ctl(struct tty_struct *tty, int break_state)
+static int sdio_uart_break_ctl(struct tty_struct *tty, int break_state)
 {
        struct sdio_uart_port *port = tty->driver_data;
+       int result;
 
-       if (sdio_uart_claim_func(port) != 0)
-               return;
+       result = sdio_uart_claim_func(port);
+       if (result != 0)
+               return result;
 
        if (break_state == -1)
                port->lcr |= UART_LCR_SBC;
@@ -899,6 +901,7 @@ static void sdio_uart_break_ctl(struct tty_struct *tty, int break_state)
        sdio_out(port, UART_LCR, port->lcr);
 
        sdio_uart_release_func(port);
+       return 0;
 }
 
 static int sdio_uart_tiocmget(struct tty_struct *tty, struct file *file)