From: "Sjur Brændeland" <sjur.brandeland@stericsson•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Randy Dunlap" <randy.dunlap@oracle•com>,
linux-next@vger•kernel.org, balbi@ti•com, netdev@vger•kernel.org,
"Sjur Brændeland" <sjur.brandeland@stericsson•com>
Subject: [PATCH] caif: Fix compile warning in caif_serial.c
Date: Fri, 27 May 2011 10:09:15 +0200 [thread overview]
Message-ID: <1306483755-3588-1-git-send-email-sjur.brandeland@stericsson.com> (raw)
In-Reply-To: <20110526143006.2d1ef9f7.randy.dunlap@oracle.com>
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@stericsson•com>
---
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
next prev parent reply other threads:[~2011-05-27 8:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 6:39 linux-next: Tree for May 26 Stephen Rothwell
2011-05-26 19:01 ` linux-next: Tree for May 26 (drivers/base/node.c) Randy Dunlap
2011-06-10 15:44 ` Randy Dunlap
2011-06-10 18:31 ` Greg KH
2011-06-10 19:53 ` Randy Dunlap
2011-05-26 19:07 ` linux-next: Tree for May 26 (drivers/net/caif) Randy Dunlap
2011-05-26 21:15 ` Sjur Brændeland
2011-05-26 21:30 ` Randy Dunlap
2011-05-27 8:09 ` Sjur Brændeland [this message]
2011-05-27 15:37 ` [PATCH] caif: Fix compile warning in caif_serial.c Randy Dunlap
2011-05-27 1:01 ` linux-next: Tree for May 26 (drivers/net/caif) Stephen Rothwell
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=1306483755-3588-1-git-send-email-sjur.brandeland@stericsson.com \
--to=sjur.brandeland@stericsson$(echo .)com \
--cc=balbi@ti$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=randy.dunlap@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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