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: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
4b8c59a3d8
commit
3127c6b225
1 changed files with 6 additions and 2 deletions
|
@ -1825,6 +1825,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
||||||
struct plat_sci_port *p)
|
struct plat_sci_port *p)
|
||||||
{
|
{
|
||||||
struct uart_port *port = &sci_port->port;
|
struct uart_port *port = &sci_port->port;
|
||||||
|
int ret;
|
||||||
|
|
||||||
port->ops = &sci_uart_ops;
|
port->ops = &sci_uart_ops;
|
||||||
port->iotype = UPIO_MEM;
|
port->iotype = UPIO_MEM;
|
||||||
|
@ -1845,8 +1846,11 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p->regtype == SCIx_PROBE_REGTYPE)
|
if (p->regtype == SCIx_PROBE_REGTYPE) {
|
||||||
BUG_ON(sci_probe_regmap(p) != 0);
|
ret = sci_probe_regmap(p);
|
||||||
|
if (unlikely(!ret))
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
if (dev) {
|
if (dev) {
|
||||||
sci_port->iclk = clk_get(&dev->dev, "sci_ick");
|
sci_port->iclk = clk_get(&dev->dev, "sci_ick");
|
||||||
|
|
Reference in a new issue