Commit 96289450 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] parport pnp detection fix

From: Adam Belay <ambx1@neo.rr.com>

Fix http://bugme.osdl.org/show_bug.cgi?id=2540

It prevents PnP detection if devices were already detected by SuperIO.
parent f155a04d
...@@ -2955,10 +2955,13 @@ static int __init parport_pc_find_ports (int autoirq, int autodma) ...@@ -2955,10 +2955,13 @@ static int __init parport_pc_find_ports (int autoirq, int autodma)
/* Onboard SuperIO chipsets that show themselves on the PCI bus. */ /* Onboard SuperIO chipsets that show themselves on the PCI bus. */
count += parport_pc_init_superio (autoirq, autodma); count += parport_pc_init_superio (autoirq, autodma);
r = pnp_register_driver (&parport_pc_pnp_driver); /* PnP ports, skip detection if SuperIO already found them */
if (r >= 0) { if (!count) {
pnp_registered_parport = 1; r = pnp_register_driver (&parport_pc_pnp_driver);
count += r; if (r >= 0) {
pnp_registered_parport = 1;
count += r;
}
} }
/* ISA ports and whatever (see asm/parport.h). */ /* ISA ports and whatever (see asm/parport.h). */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment