1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index ef5933b93590..3b6e5358c723 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -1855,8 +1855,9 @@ static int handle_goto(struct vc_data *vc, u_char type, u_char ch, u_short key)
 {
         static u_char goto_buf[8];
         static int num;
-        int maxlen, go_pos;
+        int maxlen;
         char *cp;
+
         if (type == KT_SPKUP && ch == SPEAKUP_GOTO)
                 goto do_goto;
         if (type == KT_LATIN && ch == '\n')
@@ -1891,25 +1892,24 @@ oops:
                 spk_special_handler = NULL;
                 return 1;
         }
-        go_pos = kstrtol(goto_buf, 10, (long *)&cp);
-        goto_pos = (u_long) go_pos;
+
+        goto_pos = simple_strtoul(goto_buf, &cp, 10);
+
         if (*cp == 'x') {
                 if (*goto_buf < '0')
                         goto_pos += spk_x;
-                else
+                else if (goto_pos > 0)
                         goto_pos--;
-                if (goto_pos < 0)
-                        goto_pos = 0;
+
                 if (goto_pos >= vc->vc_cols)
                         goto_pos = vc->vc_cols - 1;
                 goto_x = 1;
         } else {
                 if (*goto_buf < '0')
                         goto_pos += spk_y;
-                else
+                else if (goto_pos > 0)
                         goto_pos--;
-                if (goto_pos < 0)
-                        goto_pos = 0;
+
                 if (goto_pos >= vc->vc_rows)
                         goto_pos = vc->vc_rows - 1;
                 goto_x = 0;