]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
rio: addition has higher precedence than ?:
authorRoel Kluin <roel.kluin@gmail.com>
Mon, 6 Apr 2009 16:35:34 +0000 (17:35 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Apr 2009 21:36:43 +0000 (14:36 -0700)
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/rio/rio_linux.c

index 2e8a6eed34be59039c57fbb6151973b8c19c9c3d..ce81da5b2da9a20079cf46fe64eddcac546b1474 100644 (file)
@@ -333,7 +333,7 @@ void rio_copy_to_card(void *from, void __iomem *to, int len)
 
 int rio_minor(struct tty_struct *tty)
 {
-       return tty->index + (tty->driver == rio_driver) ? 0 : 256;
+       return tty->index + ((tty->driver == rio_driver) ? 0 : 256);
 }
 
 static int rio_set_real_termios(void *ptr)