Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 94f91def998efe3b79780f3b39b6c87d390dbe4c

Authored by Rocky Craig
Committed by Linus Torvalds
1 parent 386093ef9a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] IPMI: remove invalid acpi register spacing check 

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>

Showing 1 changed file with 0 additions and 8 deletions Side-by-side Diff

drivers/char/ipmi/ipmi_si_intf.c
Diff comments   View file @ 94f91de
... ... @@ -1580,11 +1580,6 @@
1580 1580 if (! is_new_interface(-1, addr_space, spmi->addr.address))
1581 1581 return -ENODEV;
1582 1582  
1583   - if (! spmi->addr.register_bit_width) {
1584   - acpi_failure = 1;
1585   - return -ENODEV;
1586   - }
1587   -
1588 1583 /* Figure out the interface type. */
1589 1584 switch (spmi->InterfaceType)
1590 1585 {
... ... @@ -1634,9 +1629,6 @@
1634 1629 regspacings[intf_num] = spmi->addr.register_bit_width / 8;
1635 1630 info->io.regspacing = spmi->addr.register_bit_width / 8;
1636 1631 } else {
1637   - /* Some broken systems get this wrong and set the value
1638   - * to zero. Assume it is the default spacing. If that
1639   - * is wrong, too bad, the vendor should fix the tables. */
1640 1632 regspacings[intf_num] = DEFAULT_REGSPACING;
1641 1633 info->io.regspacing = DEFAULT_REGSPACING;
1642 1634 }