* [PATCH] ipmi: fix acpi probe print
@ 2010-08-11 1:50 Yinghai Lu
0 siblings, 0 replies; 2+ messages in thread
From: Yinghai Lu @ 2010-08-11 1:50 UTC (permalink / raw)
To: Corey Minyard, Andrew Morton
Cc: Matthew Garrett, Len Brown, Myron Stowe, openipmi-developer,
linux-kernel
After
|commit d9e1b6c45059ccfff647a120769ae86da78dfdc4
|
| ipmi: fix ACPI detection with regspacing
got
[ 11.026326] ipmi_si: probing via ACPI
[ 11.030019] ipmi_si 00:09: (null) regsize 1 spacing 1 irq 0
[ 11.035594] ipmi_si: Adding ACPI-specified kcs state machine
on old system with only one range for ipmi kcs range.
Try to fix it by adding another res pointer.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/char/ipmi/ipmi_si_intf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
@@ -2132,7 +2132,7 @@ static int __devinit ipmi_pnp_probe(stru
{
struct acpi_device *acpi_dev;
struct smi_info *info;
- struct resource *res;
+ struct resource *res, *res_second;
acpi_handle handle;
acpi_status status;
unsigned long long tmp;
@@ -2188,13 +2188,13 @@ static int __devinit ipmi_pnp_probe(stru
info->io.addr_data = res->start;
info->io.regspacing = DEFAULT_REGSPACING;
- res = pnp_get_resource(dev,
+ res_second = pnp_get_resource(dev,
(info->io.addr_type == IPMI_IO_ADDR_SPACE) ?
IORESOURCE_IO : IORESOURCE_MEM,
1);
- if (res) {
- if (res->start > info->io.addr_data)
- info->io.regspacing = res->start - info->io.addr_data;
+ if (res_second) {
+ if (res_second->start > info->io.addr_data)
+ info->io.regspacing = res_second->start - info->io.addr_data;
}
info->io.regsize = DEFAULT_REGSPACING;
info->io.regshift = 0;
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH] ipmi: fix acpi probe print
@ 2010-09-10 2:43 Corey Minyard
0 siblings, 0 replies; 2+ messages in thread
From: Corey Minyard @ 2010-09-10 2:43 UTC (permalink / raw)
To: Andrew Morton, Linux Kernel, OpenIPMI Developers; +Cc: Yinghai Lu
From: Yinghai Lu <yinghai@kernel.org>
After
|commit d9e1b6c45059ccfff647a120769ae86da78dfdc4
|
| ipmi: fix ACPI detection with regspacing
got
[ 11.026326] ipmi_si: probing via ACPI
[ 11.030019] ipmi_si 00:09: (null) regsize 1 spacing 1 irq 0
[ 11.035594] ipmi_si: Adding ACPI-specified kcs state machine
on old system with only one range for ipmi kcs range.
Try to fix it by adding another res pointer.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
drivers/char/ipmi/ipmi_si_intf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6.35/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.35.orig/drivers/char/ipmi/ipmi_si_intf.c 2010-09-09 21:26:35.980978855 -0500
+++ linux-2.6.35/drivers/char/ipmi/ipmi_si_intf.c 2010-09-09 21:26:50.542230669 -0500
@@ -2126,7 +2126,7 @@
{
struct acpi_device *acpi_dev;
struct smi_info *info;
- struct resource *res;
+ struct resource *res, *res_second;
acpi_handle handle;
acpi_status status;
unsigned long long tmp;
@@ -2182,13 +2182,13 @@
info->io.addr_data = res->start;
info->io.regspacing = DEFAULT_REGSPACING;
- res = pnp_get_resource(dev,
+ res_second = pnp_get_resource(dev,
(info->io.addr_type == IPMI_IO_ADDR_SPACE) ?
IORESOURCE_IO : IORESOURCE_MEM,
1);
- if (res) {
- if (res->start > info->io.addr_data)
- info->io.regspacing = res->start - info->io.addr_data;
+ if (res_second) {
+ if (res_second->start > info->io.addr_data)
+ info->io.regspacing = res_second->start - info->io.addr_data;
}
info->io.regsize = DEFAULT_REGSPACING;
info->io.regshift = 0;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-10 2:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-11 1:50 [PATCH] ipmi: fix acpi probe print Yinghai Lu
-- strict thread matches above, loose matches on Subject: below --
2010-09-10 2:43 Corey Minyard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox