Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8ebce6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents 0676fc12 b2281abf

drivers/serial/8250_early.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 {