linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [resend] fix broken isapnp handling in file2alias (for 3.3-rc)
@ 2012-02-13 14:52 Ondrej Zary
  2012-02-14  0:20 ` Rusty Russell
  0 siblings, 1 reply; 2+ messages in thread
From: Ondrej Zary @ 2012-02-13 14:52 UTC (permalink / raw)
  To: Rusty Russell; +Cc: linux-kernel, Greg KH

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 <linux@rainbow-software.org>

--- 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] [resend] fix broken isapnp handling in file2alias (for 3.3-rc)
  2012-02-13 14:52 [PATCH] [resend] fix broken isapnp handling in file2alias (for 3.3-rc) Ondrej Zary
@ 2012-02-14  0:20 ` Rusty Russell
  0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2012-02-14  0:20 UTC (permalink / raw)
  To: Ondrej Zary; +Cc: linux-kernel, Greg KH

On Mon, 13 Feb 2012 15:52:59 +0100, Ondrej Zary <linux@rainbow-software.org> 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 <linux@rainbow-software.org>

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

Cheers,
Rusty.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-14  0:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-13 14:52 [PATCH] [resend] fix broken isapnp handling in file2alias (for 3.3-rc) Ondrej Zary
2012-02-14  0:20 ` Rusty Russell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).