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

Commit 3127c6b2 authored by Paul Mundt's avatar Paul Mundt
Browse files

serial: sh-sci: Regtype probing doesn't need to be fatal. 



This was using a BUG_ON(), but it's not strictly necessary, so relax the
constraints a bit.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4b8c59a3

drivers/tty/serial/sh-sci.c

+6 −2
Original line number Diff line number Diff line
@@ -1825,6 +1825,7 @@ static int __devinit sci_init_single(struct platform_device *dev, 
				     struct plat_sci_port *p)

{

	struct uart_port *port = &sci_port->port;

	int ret;



	port->ops	= &sci_uart_ops;

	port->iotype	= UPIO_MEM;
@@ -1845,8 +1846,11 @@ static int __devinit sci_init_single(struct platform_device *dev, 
		break;

	}



	if (p->regtype == SCIx_PROBE_REGTYPE)

		BUG_ON(sci_probe_regmap(p) != 0);

	if (p->regtype == SCIx_PROBE_REGTYPE) {

		ret = sci_probe_regmap(p);

		if (unlikely(!ret))

			return ret;

	}



	if (dev) {

		sci_port->iclk = clk_get(&dev->dev, "sci_ick");