diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 13:42:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 13:42:53 -0500 |
| commit | c8ebce6eeb1f6f83fd8c0de209f1f7b627220a81 (patch) | |
| tree | 398e03a622d469bcf770ac601708c6aeb25f07fc /drivers/serial | |
| parent | 0676fc122e712751e60ae16e0f2241064711f888 (diff) | |
| parent | b2281abf115031a5242647e0b5b170ffd3bca994 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250_early.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c index b7a5dd710228..59ba5d993b4b 100644 --- a/drivers/serial/8250_early.c +++ b/drivers/serial/8250_early.c | |||
| @@ -164,7 +164,7 @@ static int __init parse_options(struct early_uart_device *device, char *options) | |||
| 164 | 164 | ||
| 165 | if ((options = strchr(options, ','))) { | 165 | if ((options = strchr(options, ','))) { |
| 166 | options++; | 166 | options++; |
| 167 | device->baud = simple_strtoul(options, 0, 0); | 167 | device->baud = simple_strtoul(options, NULL, 0); |
| 168 | length = min(strcspn(options, " "), sizeof(device->options)); | 168 | length = min(strcspn(options, " "), sizeof(device->options)); |
| 169 | strncpy(device->options, options, length); | 169 | strncpy(device->options, options, length); |
| 170 | } else { | 170 | } else { |