Skip to content

Commit

Permalink
serial: sh-sci: Regtype probing doesn't need to be fatal.
Browse files Browse the repository at this point in the history
This was using a BUG_ON(), but it's not strictly necessary, so relax the
constraints a bit.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Jun 28, 2011
1 parent 4b8c59a commit 3127c6b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand Down

0 comments on commit 3127c6b

Please sign in to comment.