diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/serial/8250_early.c | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
| download | op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/8250_early.c')
| -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 b7a5dd7..59ba5d9 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) if ((options = strchr(options, ','))) { options++; - device->baud = simple_strtoul(options, 0, 0); + device->baud = simple_strtoul(options, NULL, 0); length = min(strcspn(options, " "), sizeof(device->options)); strncpy(device->options, options, length); } else { |
