Merge master.kernel.org:/home/rmk/linux-2.6-serial

1ff9ba7a · Linus Torvalds · 66e05225 · c2cd6d3c · 1ff9ba7a
Commit 1ff9ba7a authored 19 years ago by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/8250_pci.c drivers/serial/8250_pci.c +1 -1

No files found.
--- 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 */