diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/char/rocket.c | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/rocket.c')
-rw-r--r-- | drivers/char/rocket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 928b850cc679..d3bc731fbb27 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -2512,10 +2512,8 @@ static void rp_cleanup_module(void) | |||
2512 | "rocketport driver\n", -retval); | 2512 | "rocketport driver\n", -retval); |
2513 | put_tty_driver(rocket_driver); | 2513 | put_tty_driver(rocket_driver); |
2514 | 2514 | ||
2515 | for (i = 0; i < MAX_RP_PORTS; i++) { | 2515 | for (i = 0; i < MAX_RP_PORTS; i++) |
2516 | if (rp_table[i]) | 2516 | kfree(rp_table[i]); |
2517 | kfree(rp_table[i]); | ||
2518 | } | ||
2519 | 2517 | ||
2520 | for (i = 0; i < NUM_BOARDS; i++) { | 2518 | for (i = 0; i < NUM_BOARDS; i++) { |
2521 | if (rcktpt_io_addr[i] <= 0 || is_PCI[i]) | 2519 | if (rcktpt_io_addr[i] <= 0 || is_PCI[i]) |