From: Corey Minyard 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 Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton --- drivers/char/ipmi/ipmi_si_intf.c | 8 -------- 1 files changed, 8 deletions(-) diff -puN drivers/char/ipmi/ipmi_si_intf.c~ipmi-remove-invalid-acpi-register-spacing-check drivers/char/ipmi/ipmi_si_intf.c --- devel/drivers/char/ipmi/ipmi_si_intf.c~ipmi-remove-invalid-acpi-register-spacing-check 2006-01-25 12:03:39.000000000 -0800 +++ devel-akpm/drivers/char/ipmi/ipmi_si_intf.c 2006-01-25 12:03:39.000000000 -0800 @@ -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; } _