summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 02:24:36 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 02:24:36 +0300
commit1ff9ba7af6033475998be61c7d1dc0e0c8c11181 (patch)
treec1a938d3cd7964cb7c7239675a49347f9174ca4d
parent66e05225262cd9271fac13fe2fd1e9edb65e3978 (diff)
parentc2cd6d3c122798c39f63e21e4dd04ee5790010b6 (diff)
downloadlinux-1ff9ba7af6033475998be61c7d1dc0e0c8c11181.tar.xz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r--drivers/serial/8250_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 8d92adfbb8bd..8adca0ce267f 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board,
break;
case 3:
offset = board->uart_offset;
- bar = 1;
+ /* FALLTHROUGH */
case 4: /* BAR 2 */
case 5: /* BAR 3 */
case 6: /* BAR 4 */