---

yaml --- r: 376071 b: refs/heads/master c: e037f95 h: refs/heads/master i: 376069: a5e8159 376067: 13b9480 376063: d9a6e3b v: v3
git-mirror · May 22, 2013 · eeac0d7 · eeac0d7
1 parent 92a5d0f
commit eeac0d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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))