2012-02-13 14:53:21

by Ondrej Zary

Subject: [PATCH] [resend] 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".

Signed-off-by: Ondrej Zary <[email protected]>

--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -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.


--
Ondrej Zary

2012-02-14 00:39:20

by Rusty Russell

Subject: Re: [PATCH] [resend] fix broken isapnp handling in file2alias (for 3.3-rc)

On Mon, 13 Feb 2012 15:52:59 +0100, Ondrej Zary <[email protected]> wrote:
> 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".
>
> Signed-off-by: Ondrej Zary <[email protected]>

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

Cheers,
Rusty.