summaryrefslogtreecommitdiff
path: root/drivers/input/gameport
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2005-05-29 11:25:01 +0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-05-29 11:25:01 +0400
commitf6397cecadc52779902bdd8f8cd3ea5af3a19ad1 (patch)
tree276cc82e654597a62b6123d24e5ce2022e305803 /drivers/input/gameport
parent7d6064d44bc79e328f2794ee7322ba2676511e2b (diff)
downloadlinux-f6397cecadc52779902bdd8f8cd3ea5af3a19ad1.tar.xz
Input: Probe PnP gameports first, ISA after that.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/gameport')
-rw-r--r--drivers/input/gameport/ns558.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 7c5c6318eeb9..1ab5f2dc8a2a 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -258,18 +258,18 @@ static int __init ns558_init(void)
{
int i = 0;
+ if (pnp_register_driver(&ns558_pnp_driver) >= 0)
+ pnp_registered = 1;
+
/*
- * Probe ISA ports first so that PnP gets to choose free port addresses
- * not occupied by the ISA ports.
+ * Probe ISA ports after PnP, so that PnP ports that are already
+ * enabled get detected as PnP. This may be suboptimal in multi-device
+ * configurations, but saves hassle with simple setups.
*/
while (ns558_isa_portlist[i])
ns558_isa_probe(ns558_isa_portlist[i++]);
- if (pnp_register_driver(&ns558_pnp_driver) >= 0)
- pnp_registered = 1;
-
-
return (list_empty(&ns558_list) && !pnp_registered) ? -ENODEV : 0;
}