Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
c8ebce6eeb
|
@ -164,7 +164,7 @@ static int __init parse_options(struct early_uart_device *device, char *options)
|
||||||
|
|
||||||
if ((options = strchr(options, ','))) {
|
if ((options = strchr(options, ','))) {
|
||||||
options++;
|
options++;
|
||||||
device->baud = simple_strtoul(options, 0, 0);
|
device->baud = simple_strtoul(options, NULL, 0);
|
||||||
length = min(strcspn(options, " "), sizeof(device->options));
|
length = min(strcspn(options, " "), sizeof(device->options));
|
||||||
strncpy(device->options, options, length);
|
strncpy(device->options, options, length);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue