Skip to contentSkip to conversation

fix broken isapnp handling in file2alias (for 3.3-rc)

PATCH RESEND In review Ondrej Zary 2 participants 2 messages Feb 13, 2012 – Feb 14, 2012 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 fix broken isapnp handling in file2alias (for 3.3-rc)

Handling of isapnp module aliases was broken by commit 626596e295d477c0fefa08cd5daa7dd011b1bb2c by changing "isapnp" string to "isa". The code was then modified by commit e49ce14150c64b29a8dd211df785576fa19a9858 but this bug remained.

Change the string back to "isapnp".

scripts/mod/file2alias.c +1 -1
@@ -942,7 +942,7 @@ static int do_isapnp_entry(const char *filename,
 		(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
 	return 1;
 }
-ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry);
+ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry);
 
 /*
  * Append a match expression for a single masked hex digit.
Signature · 1 line
Ondrej Zary
#1 lore raw
Quoted 8 lines · Ondrej Zary

Handling of isapnp module aliases was broken by commit 626596e295d477c0fefa08cd5daa7dd011b1bb2c by changing "isapnp" string to "isa". The code was then modified by commit e49ce14150c64b29a8dd211df785576fa19a9858 but this bug remained.

Change the string back to "isapnp".

Thanks, I've already queued this, it's in linux-next and I'll be sending to Linus today.

Cheers,
Rusty.