diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 06:45:28 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 06:45:28 +0200 |
| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 (patch) | |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d /drivers/tty/serial/sh-sci.c | |
| parent | serial: sh-sci: console Runtime PM support (diff) | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-77c7ee51a062bb595c501ec098125a68999c20c3.tar.xz linux-77c7ee51a062bb595c501ec098125a68999c20c3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
drivers/tty/serial/sh-sci.c
Signed-off-by: Paul Mundt <lethal@linux-sh.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 ffcaceee0215..18e6342af073 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -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; } |