|
@@ -2126,7 +2126,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
|
|
|
{
|
|
|
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 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
|
|
|
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;
|