sh: Fix boot crash related to SCI

rjwysocki · torvalds · commit fc97114b8d67 · 2011-08-07T15:51:45.000-07:00
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 &lt;rjw@sisk.pl&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1889,7 +1889,7 @@ static int __devinit sci_init_single(struct platform_device *dev,`
`1889`	`1889`
`1890`	`1890`	`if (p->regtype == SCIx_PROBE_REGTYPE) {`
`1891`	`1891`	`ret = sci_probe_regmap(p);`
`1892`		`- if (unlikely(!ret))`
	`1892`	`+ if (unlikely(ret))`
`1893`	`1893`	`return ret;`
`1894`	`1894`	`}`
`1895`	`1895`