aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index ff68e7c34ce7..ecfe43beb9c2 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1965,8 +1965,8 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
1965 1965
1966/* 1966/*
1967 * Defined at 1967 * Defined at
1968 * http://h21007.www2.hp.com/dspp/files/unprotected/devresource/ 1968 * http://h21007.www2.hp.com/portal/download/files
1969 * Docs/TechPapers/IA64/hpspmi.pdf 1969 * /unprot/hpspmi.pdf
1970 */ 1970 */
1971struct SPMITable { 1971struct SPMITable {
1972 s8 Signature[4]; 1972 s8 Signature[4];
@@ -2013,18 +2013,12 @@ struct SPMITable {
2013static __devinit int try_init_spmi(struct SPMITable *spmi) 2013static __devinit int try_init_spmi(struct SPMITable *spmi)
2014{ 2014{
2015 struct smi_info *info; 2015 struct smi_info *info;
2016 u8 addr_space;
2017 2016
2018 if (spmi->IPMIlegacy != 1) { 2017 if (spmi->IPMIlegacy != 1) {
2019 printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy); 2018 printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
2020 return -ENODEV; 2019 return -ENODEV;
2021 } 2020 }
2022 2021
2023 if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
2024 addr_space = IPMI_MEM_ADDR_SPACE;
2025 else
2026 addr_space = IPMI_IO_ADDR_SPACE;
2027
2028 info = kzalloc(sizeof(*info), GFP_KERNEL); 2022 info = kzalloc(sizeof(*info), GFP_KERNEL);
2029 if (!info) { 2023 if (!info) {
2030 printk(KERN_ERR PFX "Could not allocate SI data (3)\n"); 2024 printk(KERN_ERR PFX "Could not allocate SI data (3)\n");