diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:44 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:44 +0200 |
commit | 60b1ae0cd469825e4db0837f5f19c3a8084300c3 (patch) | |
tree | 563aafa40012d1bb8218987ffeb76c88743e18e5 /drivers | |
parent | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (diff) | |
parent | 8c285645ab3b05942124020b5f0b89d3b539823a (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers')
-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 d0a56235c50..2ec57b2fb27 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; } |