diff options
author | Matwey V. Kornilov <matwey@sai.msu.ru> | 2013-05-22 03:13:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-22 13:26:02 -0400 |
commit | e037f95ffb5355ffe295e1d106d02fefd284d882 (patch) | |
tree | c89836ec44472e2e63c5727ced112976ce780328 | |
parent | dfc7b837c7f9f01f76511aa3eeea35232903e58f (diff) |
tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)
Fix build warning at mxser.c introduced by dfc7b837c7f9 (tty: mxser: fix
usage of opmode_ioaddr)
Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/mxser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index f97b196693c6..4c4a23674569 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c | |||
@@ -1674,15 +1674,15 @@ static int mxser_ioctl(struct tty_struct *tty, | |||
1674 | return mxser_ioctl_special(cmd, argp); | 1674 | return mxser_ioctl_special(cmd, argp); |
1675 | 1675 | ||
1676 | if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) { | 1676 | if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) { |
1677 | if (info->board->chip_flag != MOXA_MUST_MU860_HWID) | ||
1678 | return -EFAULT; | ||
1679 | |||
1680 | int p; | 1677 | int p; |
1681 | unsigned long opmode; | 1678 | unsigned long opmode; |
1682 | static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f }; | 1679 | static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f }; |
1683 | int shiftbit; | 1680 | int shiftbit; |
1684 | unsigned char val, mask; | 1681 | unsigned char val, mask; |
1685 | 1682 | ||
1683 | if (info->board->chip_flag != MOXA_MUST_MU860_HWID) | ||
1684 | return -EFAULT; | ||
1685 | |||
1686 | p = tty->index % 4; | 1686 | p = tty->index % 4; |
1687 | if (cmd == MOXA_SET_OP_MODE) { | 1687 | if (cmd == MOXA_SET_OP_MODE) { |
1688 | if (get_user(opmode, (int __user *) argp)) | 1688 | if (get_user(opmode, (int __user *) argp)) |