From 9f3296d8c56dd62b84880e00bd36bb4334c405c8 Mon Sep 17 00:00:00 2001 From: Pelle Windestam Date: Tue, 30 Aug 2011 20:29:24 +0200 Subject: [PATCH] --- yaml --- r: 268259 b: refs/heads/master c: 129957069e6af42a6e021d90679c56662c95f7e1 h: refs/heads/master i: 268257: 1624435ab16f7715ce7dee2a9552f6e8645bf46e 268255: cde25f96250ead8862665a8f791a4b12b8b4f75a v: v3 --- [refs] | 2 +- trunk/drivers/staging/panel/panel.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) 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; }