From patchwork Fri May 27 08:09:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 97660 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 53ACBB6FC4 for ; Fri, 27 May 2011 18:09:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758640Ab1E0IJc (ORCPT ); Fri, 27 May 2011 04:09:32 -0400 Received: from sf1.isp.kq.no ([213.172.193.37]:61050 "EHLO pmx.vmail.no" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758715Ab1E0IJb (ORCPT ); Fri, 27 May 2011 04:09:31 -0400 Received: from pmx.vmail.no (localhost [127.0.0.1]) by localhost (pmx9.isp.as2116.net) with SMTP id AA4F95F193; Fri, 27 May 2011 10:09:47 +0200 (CEST) Received: from smtp.bluecom.no (smtp.bluecom.no [193.75.75.28]) by pmx.vmail.no (pmx9.isp.as2116.net) with ESMTP id 9A4955F114; Fri, 27 May 2011 10:09:47 +0200 (CEST) Received: from localhost.localdomain (unknown [212.4.57.94]) by smtp.bluecom.no (Postfix) with ESMTP id B5E35FB; Fri, 27 May 2011 10:09:28 +0200 (CEST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: Stephen Rothwell Cc: Randy Dunlap , linux-next@vger.kernel.org, balbi@ti.com, netdev@vger.kernel.org, =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH] caif: Fix compile warning in caif_serial.c Date: Fri, 27 May 2011 10:09:15 +0200 Message-Id: <1306483755-3588-1-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20110526143006.2d1ef9f7.randy.dunlap@oracle.com> References: <20110526143006.2d1ef9f7.randy.dunlap@oracle.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the compile warning introduced by the patch: "tty: make receive_buf() return the amout of bytes received" Signed-off-by: Sjur Brændeland Acked-by: Randy Dunlap --- 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);