summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-28 13:44:37 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-06-28 13:44:37 +0900
commit3127c6b225c6893bdfcd4db64d4316ce317fc10f (patch)
treeb4f64a061017d8d334fbf8412868ae7ea9d2193c
parent4b8c59a3d83e9cf2b65b16999a0c704fc72de056 (diff)
downloadop-kernel-dev-3127c6b225c6893bdfcd4db64d4316ce317fc10f.zip
op-kernel-dev-3127c6b225c6893bdfcd4db64d4316ce317fc10f.tar.gz
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>
-rw-r--r--drivers/tty/serial/sh-sci.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 8e55e0a..5ff6657 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -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");
OpenPOWER on IntegriCloud