diff --git a/[refs] b/[refs]
index 8b223dd8c657..f33cd603a083 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cecd9203c211c514ef9022b6d54c06996f71d30
+refs/heads/master: 129957069e6af42a6e021d90679c56662c95f7e1
diff --git a/trunk/drivers/staging/panel/panel.c b/trunk/drivers/staging/panel/panel.c
index b303b7e42b63..4683d5f355c0 100644
--- a/trunk/drivers/staging/panel/panel.c
+++ b/trunk/drivers/staging/panel/panel.c
@@ -1179,16 +1179,14 @@ static inline int handle_lcd_special_code(void)
 			break;
 
 		while (*esc) {
-			char *endp;
-
 			if (*esc == 'x') {
 				esc++;
-				lcd_addr_x = simple_strtoul(esc, &endp, 10);
-				esc = endp;
+				if (kstrtoul(esc, 10, &lcd_addr_x) < 0)
+					break;
 			} else if (*esc == 'y') {
 				esc++;
-				lcd_addr_y = simple_strtoul(esc, &endp, 10);
-				esc = endp;
+				if (kstrtoul(esc, 10, &lcd_addr_y) < 0)
+					break;
 			} else
 				break;
 		}