[PATCH] IPMI remove invalid acpi register spacing check

From: Corey Minyard
Date: Wed Jan 25 2006 - 14:43:55 EST


Could this go in for 2.6.16? It has been well-tested.

At the 2.6.12 timeframe ipmi_si_intf.c was patched to provide
default register spacings in try_init_acpi() if the register
spacing was set to zero, similar to code in other routines.
Unfortunately, another patch was simultaneously added that
exits early from try_init_acpi() if the register spacings
are set to zero, circumventing the new defaults. This patch
removes the early exit code and some incorrect comments that
aren't present in other common code snippets.

Signed-off-by: Rocky Craig <rocky.craig@xxxxxx>
Signed-off-by: Corey Minyard <minyard@xxxxxxx>

Index: linux-2.6.15/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.15.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6.15/drivers/char/ipmi/ipmi_si_intf.c
@@ -1580,11 +1580,6 @@ static int try_init_acpi(int intf_num, s
if (! is_new_interface(-1, addr_space, spmi->addr.address))
return -ENODEV;

- if (! spmi->addr.register_bit_width) {
- acpi_failure = 1;
- return -ENODEV;
- }
-
/* Figure out the interface type. */
switch (spmi->InterfaceType)
{
@@ -1634,9 +1629,6 @@ static int try_init_acpi(int intf_num, s
regspacings[intf_num] = spmi->addr.register_bit_width / 8;
info->io.regspacing = spmi->addr.register_bit_width / 8;
} else {
- /* Some broken systems get this wrong and set the value
- * to zero. Assume it is the default spacing. If that
- * is wrong, too bad, the vendor should fix the tables. */
regspacings[intf_num] = DEFAULT_REGSPACING;
info->io.regspacing = DEFAULT_REGSPACING;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/