aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@hp.com>2010-05-26 14:43:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 09:12:50 -0700
commit8c8eae2742d5ad05ef6e5b53c88e70a5231d7d9a (patch)
treea45d86d1183f236c1b779d675ae0c32199319325 /drivers/char
parentddac44b7b21b72c0d9d6882ac8d7027afc25138c (diff)
downloadvexpress-lsk-8c8eae2742d5ad05ef6e5b53c88e70a5231d7d9a.tar.gz
ipmi: convert tracking of the ACPI device pointer to a PNP device
Convert PNP patch (git 9e368fa011d4e0aa050db348d69514900520e40b) to maintain a pointer to a PNP device, 'pnp_dev', instead of the ACPI device, 'acpi_dev', that is currently being tracked with PNP based IPMI device discovery. Signed-off-by: Myron Stowe <myron.stowe@hp.com> Acked-by: Zhao Yakui <yakui.zhao@intel.com> Acked-by: Corey Minyard <minyard@acm.org> Cc: Len Brown <lenb@kernel.org> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 6503d995b72..31bbcbdd178 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2183,7 +2183,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
info->irq_setup = std_irq_setup;
}
- info->dev = &acpi_dev->dev;
+ info->dev = &dev->dev;
pnp_set_drvdata(dev, info);
return add_smi(info);