Subject: Re: [PATCH] caif: Fix compile warning in caif_serial.c

From: Randy Dunlap <[email-masked]>
Date: Fri, 27 May 2011 08:37:23 -0700

On 05/27/11 01:09, Sjur Brændeland wrote:
> Fix the compile warning introduced by the patch:
> "tty: make receive_buf() return the amout of bytes received"
> 
> Signed-off-by: Sjur Brændeland <[email-masked]>
> ---
> Note: Fixes compile issue in linux-next (no issue in net-2.6).

Acked-by: Randy Dunlap <[email-masked]>

Thanks much, Sjur.

>  drivers/net/caif/caif_serial.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
> index 73c7e03..751ebbd 100644
> --- a/drivers/net/caif/caif_serial.c
> +++ b/drivers/net/caif/caif_serial.c
> @@ -191,7 +191,7 @@ static unsigned int ldisc_receive(struct tty_struct *tty,
>  		dev_info(&ser->dev->dev,
>  			"Bytes received before initial transmission -"
>  			"bytes discarded.\n");
> -		return;
> +		return count;
>  	}
>  
>  	BUG_ON(ser->dev == NULL);
> @@ -199,7 +199,7 @@ static unsigned int ldisc_receive(struct tty_struct *tty,
>  	/* Get a suitable caif packet and copy in data. */
>  	skb = netdev_alloc_skb(ser->dev, count+1);
>  	if (skb == NULL)
> -		return;
> +		return 0;
>  	p = skb_put(skb, count);
>  	memcpy(p, data, count);
>  

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***