Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / drivers / staging / panel / panel.c

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index b303b7e42b63de6044e7d588bd5ba88b78ef7b38..6183573f112f3487ac0caf0add169c521115f4b5 100644 (file)
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -58,7 +58,6 @@
 
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <asm/system.h>
 
 #define LCD_MINOR              156
 #define KEYPAD_MINOR           185
@@ -1179,16 +1178,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;
                }