From: Corey Minyard <minyard@acm.org>
Date: Thu, 7 Dec 2006 04:41:11 +0000 (-0800)
Subject: [PATCH] IPMI: fix pci warning
X-Git-Tag: v2.6.20-rc1~145^2^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=168b35a7f67c5a8189e6b92780dfb5262604057c;p=linux-2.6-omap-h63xx.git

[PATCH] IPMI: fix pci warning

Change pci_module_init() to the new interface, and check the return code to
avoid warnings and give the user useful information if this fails.

Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 8b36b503639..c7de2e86a6d 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2774,7 +2774,12 @@ static __devinit int init_ipmi_si(void)
 #endif
 
 #ifdef CONFIG_PCI
-	pci_module_init(&ipmi_pci_driver);
+	rv = pci_register_driver(&ipmi_pci_driver);
+	if (rv){
+		printk(KERN_ERR
+		       "init_ipmi_si: Unable to register PCI driver: %d\n",
+		       rv);
+	}
 #endif
 
 	if (si_trydefaults) {