lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 18 Jul 2008 08:02:45 +0200 (CEST) From: Geert Uytterhoeven <geert@...ux-m68k.org> To: David Howells <dhowells@...hat.com>, Linus Torvalds <torvalds@...ux-foundation.org> cc: drzeus-mmc@...eus.cx, Andrew Morton <akpm@...ux-foundation.org>, alan@...hat.com, Linux Kernel Development <linux-kernel@...r.kernel.org> Subject: Re: [PATCH] Fix SDIO break control to now return success or an error On Thu, 10 Jul 2008, David Howells wrote: > Fix SDIO break control to now return success or an error. This patch is now in mainline as commit c43d8636971c39da993e94082fd65bfff421618e. > This is a consequence of patch 9ea761bfef52c116fed4715d4043392c2503fe6a. But this isn't, causing | drivers/mmc/card/sdio_uart.c:1007: warning: initialization from incompatible pointer type > Signed-off-by: David Howells <dhowells@...hat.com> > --- > > drivers/mmc/card/sdio_uart.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > > diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c > index eeea84c..78ad487 100644 > --- a/drivers/mmc/card/sdio_uart.c > +++ b/drivers/mmc/card/sdio_uart.c > @@ -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) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists