Skip to content

Commit

Permalink
tty: mxser: Fix build warning introduced by dfc7b83 (Re: linux-next: …
Browse files Browse the repository at this point in the history
…build warning after merge of the tty.current tree)

Fix build warning at mxser.c introduced by dfc7b83 (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>
  • Loading branch information
Matwey V. Kornilov authored and Greg Kroah-Hartman committed May 22, 2013
1 parent dfc7b83 commit e037f95
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/tty/mxser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit e037f95

Please sign in to comment.