diff --git a/[refs] b/[refs]
index e83900a30709..b400462680f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7f8d437bda0ec409e26cffb846bc28a40603ee3
+refs/heads/master: f0e8527726b9e56649b9eafde3bc0fbc4dd2dd47
diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
index 4a4cab73d0be..65b6ff2442c6 100644
--- a/trunk/drivers/char/moxa.c
+++ b/trunk/drivers/char/moxa.c
@@ -1184,6 +1184,11 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
 		return -ENODEV;
 	}
 
+	if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
+		mutex_unlock(&moxa_openlock);
+		return -ENODEV;
+	}
+
 	ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
 	ch->port.count++;
 	tty->driver_data = ch;