Merge tag 'v3.10-rc7' into drm-next

[~andy/linux] / drivers / tty / mxser.c

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index f97b196693c658727608d8bcf3527874426cf9e4..4c4a236745692ab1ee2e674f5d7dbf0334002dae 100644 (file)
--- 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))