Skip to content

Commit

Permalink
[PATCH] IPMI: remove invalid acpi register spacing check
Browse files Browse the repository at this point in the history
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@hp.com>
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Rocky Craig authored and Linus Torvalds committed Feb 1, 2006
1 parent 386093e commit 94f91de
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,11 +1580,6 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
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)
{
Expand Down Expand Up @@ -1634,9 +1629,6 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
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;
}
Expand Down

0 comments on commit 94f91de

Please sign in to comment.