Fix the compile warning introduced by the patch: "tty: make receive_buf() return the amout of bytes received" Signed-off-by: Sjur BrÃndeland <sjur.brandeland@xxxxxxxxxxxxxx> --- Note: Fixes compile issue in linux-next (no issue in net-2.6). 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); -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html