mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Brownell <david-b@pacbell.net>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: Re: [PATCH] usb gadget: switch to put_char returning int
Date: Sun, 13 Apr 2008 10:21:42 -0700	[thread overview]
Message-ID: <200804131021.42340.david-b@pacbell.net> (raw)
In-Reply-To: <20080413180818.519e446c@core>

On Sunday 13 April 2008, Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@redhat.com>

ACK.

> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c linux-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c
> --- linux.vanilla-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c	2008-04-13 15:36:54.000000000 +0100
> +++ linux-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c	2008-04-13 15:41:09.000000000 +0100
> @@ -170,7 +170,7 @@
>  static void gs_close(struct tty_struct *tty, struct file *file);
>  static int gs_write(struct tty_struct *tty,
>  	const unsigned char *buf, int count);
> -static void gs_put_char(struct tty_struct *tty, unsigned char ch);
> +static int gs_put_char(struct tty_struct *tty, unsigned char ch);
>  static void gs_flush_chars(struct tty_struct *tty);
>  static int gs_write_room(struct tty_struct *tty);
>  static int gs_chars_in_buffer(struct tty_struct *tty);
> @@ -883,14 +883,15 @@
>  /*
>   * gs_put_char
>   */
> -static void gs_put_char(struct tty_struct *tty, unsigned char ch)
> +static int gs_put_char(struct tty_struct *tty, unsigned char ch)
>  {
>  	unsigned long flags;
>  	struct gs_port *port = tty->driver_data;
> +	int ret = 0;
>  
>  	if (port == NULL) {
>  		pr_err("gs_put_char: NULL port pointer\n");
> -		return;
> +		return 0;
>  	}
>  
>  	gs_debug("gs_put_char: (%d,%p) char=0x%x, called from %p\n",
> @@ -910,10 +911,11 @@
>  		goto exit;
>  	}
>  
> -	gs_buf_put(port->port_write_buf, &ch, 1);
> +	ret = gs_buf_put(port->port_write_buf, &ch, 1);
>  
>  exit:
>  	spin_unlock_irqrestore(&port->port_lock, flags);
> +	return ret;
>  }
>  
>  /*
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 



      reply	other threads:[~2008-04-13 17:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-13 17:08 Alan Cox
2008-04-13 17:21 ` David Brownell [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200804131021.42340.david-b@pacbell.net \
    --to=david-b@pacbell.net \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®