leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: Probe PnP gameports first, ISA after that.

Browse Source 
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Vojtech Pavlik 2005-05-29 02:25:01 -05:00 committed by Dmitry Torokhov
parent 7d6064d44b
commit f6397cecad
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/input/gameport/ns558.c
View File

@ -258,18 +258,18 @@ static int __init ns558_init(void)
{ {
int i = 0; 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 * Probe ISA ports after PnP, so that PnP ports that are already
* not occupied by the ISA ports. * enabled get detected as PnP. This may be suboptimal in multi-device
* configurations, but saves hassle with simple setups.
*/ */
while (ns558_isa_portlist[i]) while (ns558_isa_portlist[i])
ns558_isa_probe(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; return (list_empty(&ns558_list) && !pnp_registered) ? -ENODEV : 0;
} }