xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

Browse Source 
Conflicts:
	drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2011-08-08 13:45:28 +09:00
parent 1ba7622094 322a8b0340
commit 77c7ee51a0
520 changed files with 11119 additions and 5139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/sh-sci.c
View File

@@ -1903,7 +1903,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 != 0))
if (unlikely(ret))
return ret;
}