diff options
Diffstat (limited to 'arch/powerpc/boot/serial.c')
-rw-r--r-- | arch/powerpc/boot/serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c index f2156f07571f..167ee9433de6 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c | |||
@@ -33,7 +33,7 @@ static void serial_write(const char *buf, int len) | |||
33 | scdp->putc(*buf++); | 33 | scdp->putc(*buf++); |
34 | } | 34 | } |
35 | 35 | ||
36 | static void serial_edit_cmdline(char *buf, int len) | 36 | static void serial_edit_cmdline(char *buf, int len, unsigned int timeout) |
37 | { | 37 | { |
38 | int timer = 0, count; | 38 | int timer = 0, count; |
39 | char ch, *cp; | 39 | char ch, *cp; |
@@ -44,7 +44,7 @@ static void serial_edit_cmdline(char *buf, int len) | |||
44 | cp = &buf[count]; | 44 | cp = &buf[count]; |
45 | count++; | 45 | count++; |
46 | 46 | ||
47 | while (timer++ < 5*1000) { | 47 | do { |
48 | if (scdp->tstc()) { | 48 | if (scdp->tstc()) { |
49 | while (((ch = scdp->getc()) != '\n') && (ch != '\r')) { | 49 | while (((ch = scdp->getc()) != '\n') && (ch != '\r')) { |
50 | /* Test for backspace/delete */ | 50 | /* Test for backspace/delete */ |
@@ -70,7 +70,7 @@ static void serial_edit_cmdline(char *buf, int len) | |||
70 | break; /* Exit 'timer' loop */ | 70 | break; /* Exit 'timer' loop */ |
71 | } | 71 | } |
72 | udelay(1000); /* 1 msec */ | 72 | udelay(1000); /* 1 msec */ |
73 | } | 73 | } while (timer++ < timeout); |
74 | *cp = 0; | 74 | *cp = 0; |
75 | } | 75 | } |
76 | 76 | ||