diff options
Diffstat (limited to 'drivers/char/ipmi')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 3822b4f49c84..2be457a0c0c3 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -2126,7 +2126,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev, | |||
2126 | { | 2126 | { |
2127 | struct acpi_device *acpi_dev; | 2127 | struct acpi_device *acpi_dev; |
2128 | struct smi_info *info; | 2128 | struct smi_info *info; |
2129 | struct resource *res; | 2129 | struct resource *res, *res_second; |
2130 | acpi_handle handle; | 2130 | acpi_handle handle; |
2131 | acpi_status status; | 2131 | acpi_status status; |
2132 | unsigned long long tmp; | 2132 | unsigned long long tmp; |
@@ -2182,13 +2182,13 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev, | |||
2182 | info->io.addr_data = res->start; | 2182 | info->io.addr_data = res->start; |
2183 | 2183 | ||
2184 | info->io.regspacing = DEFAULT_REGSPACING; | 2184 | info->io.regspacing = DEFAULT_REGSPACING; |
2185 | res = pnp_get_resource(dev, | 2185 | res_second = pnp_get_resource(dev, |
2186 | (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? | 2186 | (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? |
2187 | IORESOURCE_IO : IORESOURCE_MEM, | 2187 | IORESOURCE_IO : IORESOURCE_MEM, |
2188 | 1); | 2188 | 1); |
2189 | if (res) { | 2189 | if (res_second) { |
2190 | if (res->start > info->io.addr_data) | 2190 | if (res_second->start > info->io.addr_data) |
2191 | info->io.regspacing = res->start - info->io.addr_data; | 2191 | info->io.regspacing = res_second->start - info->io.addr_data; |
2192 | } | 2192 | } |
2193 | info->io.regsize = DEFAULT_REGSPACING; | 2193 | info->io.regsize = DEFAULT_REGSPACING; |
2194 | info->io.regshift = 0; | 2194 | info->io.regshift = 0; |