Commit 7a9ca632 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: 8250/serial_cs, propagate errors in simple_config 



The caller expects from the others (pfc_config and multi_config) to
return standard error values. So do the same for simple_config too.

We invert the if condition to handle the error case.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210302062214.29627-13-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e3d3c08

drivers/tty/serial/8250/serial_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -456,11 +456,11 @@ static int simple_config(struct pcmcia_device *link) 
	 * its base address, then try to grab any standard serial port

	 * address, and finally try to get any free port.

	 */

	if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))

		goto found_port;



	ret = pcmcia_loop_config(link, simple_config_check_notpicky, NULL);

	if (ret) {

		dev_warn(&link->dev, "no usable port range found, giving up\n");

	return -1;

		return ret;

	}



found_port:

	if (info->multi && (info->manfid == MANFID_3COM))
@@ -474,7 +474,7 @@ static int simple_config(struct pcmcia_device *link) 


	ret = pcmcia_enable_device(link);

	if (ret != 0)

		return -1;

		return ret;

	return setup_serial(link, info, link->resource[0]->start, link->irq);

}