From eeac0d733a510752f52dda42752cb676497f6db2 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Wed, 22 May 2013 11:13:38 +0400 Subject: [PATCH] --- yaml --- r: 376071 b: refs/heads/master c: e037f95ffb5355ffe295e1d106d02fefd284d882 h: refs/heads/master i: 376069: a5e81591291239569b259a827c8ff5c79ff84106 376067: 13b9480045e1c0546797f07057ab6ba5d4ec3d6f 376063: d9a6e3b35fdb42a4bce5512d317995bf15468243 v: v3 --- [refs] | 2 +- trunk/drivers/tty/mxser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 76c4507f79da..fccadb7dc678 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfc7b837c7f9f01f76511aa3eeea35232903e58f +refs/heads/master: e037f95ffb5355ffe295e1d106d02fefd284d882 diff --git a/trunk/drivers/tty/mxser.c b/trunk/drivers/tty/mxser.c index f97b196693c6..4c4a23674569 100644 --- a/trunk/drivers/tty/mxser.c +++ b/trunk/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))