[PATCH] Fix SDIO break control to now return success or an error

[PATCH] Fix SDIO break control to now return success or an error

[David Howells]

Fix SDIO break control to now return success or an error.

This is a consequence of patch 9ea761bfef52c116fed4715d4043392c2503fe6a.

Signed-off-by: David Howells <dhowells@redhat.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)

Re: [PATCH] Fix SDIO break control to now return success or an error

[Alan Cox]

On Thu, 10 Jul 2008 12:28:48 +0100
David Howells <dhowells@redhat.com> wrote:

> Fix SDIO break control to now return success or an error.
> 
> This is a consequence of patch 9ea761bfef52c116fed4715d4043392c2503fe6a.

Thanks. Thats what you get for hiding your tty drivers in weird places.

Re: [PATCH] Fix SDIO break control to now return success or an error

[Pierre Ossman]

On Thu, 10 Jul 2008 12:28:48 +0100
David Howells <dhowells@redhat.com> wrote:

> Fix SDIO break control to now return success or an error.
> 
> This is a consequence of patch 9ea761bfef52c116fed4715d4043392c2503fe6a.
> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> ---

Applied, thanks.

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  rdesktop, core developer          http://www.rdesktop.org

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.

Re: [PATCH] Fix SDIO break control to now return success or an error

[Geert Uytterhoeven]

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@redhat.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@linux-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

Re: [PATCH] Fix SDIO break control to now return success or an error

[Pierre Ossman]

On Fri, 18 Jul 2008 08:02:45 +0200 (CEST)
Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 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
> 

That's annoying. I just assumed the problem was one in Linus' or my tree
(why are people sending patches to me otherwise?). Alan, is this
something that will be in 2.6.27 or should I queue up a revert?

Rgds
-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  rdesktop, core developer          http://www.rdesktop.org

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.