diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-08 00:26:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-08 00:51:45 +0200 |
| commit | fc97114b8d67819fadcc5af855da9a3e6a6a329b (patch) | |
| tree | f790c70af791b6ad25cffcb10218ace9dee52896 /drivers/tty/serial/sh-sci.c | |
| parent | arm: remove stale export of 'sha_transform' (diff) | |
| download | linux-fc97114b8d67819fadcc5af855da9a3e6a6a329b.tar.xz linux-fc97114b8d67819fadcc5af855da9a3e6a6a329b.zip | |
sh: Fix boot crash related to SCI
Commit d006199e72a9 ("serial: sh-sci: Regtype probing doesn't need to be
fatal.") made sci_init_single() return when sci_probe_regmap() succeeds,
although it should return when sci_probe_regmap() fails. This causes
systems using the serial sh-sci driver to crash during boot.
Fix the problem by using the right return condition.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d0a56235c50e..2ec57b2fb278 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1889,7 +1889,7 @@ static int __devinit sci_init_single(struct platform_device *dev, if (p->regtype == SCIx_PROBE_REGTYPE) { ret = sci_probe_regmap(p); - if (unlikely(!ret)) + if (unlikely(ret)) return ret; } |