diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
| commit | 15c42e5a1f0bccb69508059b8ae0720840068b8e (patch) | |
| tree | 921b088cc7acb50bb8b65dbc30451a8a3958ec8d /drivers/input | |
| parent | 541e316aed6f7d6efeb427a88645c2a8f61418d6 (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge HEAD from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/gameport/ns558.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c index 1ab5f2dc8a2a..70f051894a3c 100644 --- a/drivers/input/gameport/ns558.c +++ b/drivers/input/gameport/ns558.c | |||
| @@ -275,9 +275,9 @@ static int __init ns558_init(void) | |||
| 275 | 275 | ||
| 276 | static void __exit ns558_exit(void) | 276 | static void __exit ns558_exit(void) |
| 277 | { | 277 | { |
| 278 | struct ns558 *ns558; | 278 | struct ns558 *ns558, *safe; |
| 279 | 279 | ||
| 280 | list_for_each_entry(ns558, &ns558_list, node) { | 280 | list_for_each_entry_safe(ns558, safe, &ns558_list, node) { |
| 281 | gameport_unregister_port(ns558->gameport); | 281 | gameport_unregister_port(ns558->gameport); |
| 282 | release_region(ns558->io & ~(ns558->size - 1), ns558->size); | 282 | release_region(ns558->io & ~(ns558->size - 1), ns558->size); |
| 283 | kfree(ns558); | 283 | kfree(ns558); |