linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build warning after merge of the tty.current tree
@ 2013-05-22  3:37 Stephen Rothwell
  2013-05-22  7:13 ` [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree) Matwey V. Kornilov
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-05-22  3:37 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Matwey V. Kornilov

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

Hi Greg,

After merging the tty.current tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

drivers/tty/mxser.c: In function 'mxser_ioctl':
drivers/tty/mxser.c:1680:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
   int p;
   ^

Introduced by commit dfc7b837c7f9 ("tty: mxser: fix usage of
opmode_ioaddr").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)
  2013-05-22  3:37 linux-next: build warning after merge of the tty.current tree Stephen Rothwell
@ 2013-05-22  7:13 ` Matwey V. Kornilov
  2013-05-22 15:35   ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Matwey V. Kornilov @ 2013-05-22  7:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, linux-next, linux-kernel, jirislaby, linux-serial

From: Matwey V. Kornilov <matwey@sai.msu.ru>

Fix build warning at mxser.c introduced by dfc7b837c7f9

Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
---

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index f97b196..4c4a236 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1674,15 +1674,15 @@ static int mxser_ioctl(struct tty_struct *tty,
  		return mxser_ioctl_special(cmd, argp);

  	if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) {
-		if (info->board->chip_flag != MOXA_MUST_MU860_HWID)
-			return -EFAULT;
-
  		int p;
  		unsigned long opmode;
  		static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f };
  		int shiftbit;
  		unsigned char val, mask;

+		if (info->board->chip_flag != MOXA_MUST_MU860_HWID)
+			return -EFAULT;
+
  		p = tty->index % 4;
  		if (cmd == MOXA_SET_OP_MODE) {
  			if (get_user(opmode, (int __user *) argp))


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)
  2013-05-22  7:13 ` [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree) Matwey V. Kornilov
@ 2013-05-22 15:35   ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2013-05-22 15:35 UTC (permalink / raw)
  To: Matwey V. Kornilov
  Cc: Stephen Rothwell, linux-next, linux-kernel, jirislaby, linux-serial

On Wed, May 22, 2013 at 11:13:38AM +0400, Matwey V. Kornilov wrote:
> From: Matwey V. Kornilov <matwey@sai.msu.ru>
> 
> Fix build warning at mxser.c introduced by dfc7b837c7f9
> 
> Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
> ---

You forgot to add "reported-by:" :(

I'll go do it by hand...

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-05-22 15:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-22  3:37 linux-next: build warning after merge of the tty.current tree Stephen Rothwell
2013-05-22  7:13 ` [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree) Matwey V. Kornilov
2013-05-22 15:35   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).