diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-06-29 18:05:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-29 18:29:31 -0400 |
| commit | 56480287f9776adc5b1a7a335ef62a9b9879ad7f (patch) | |
| tree | 74d6962b3e056fdf6303f7fc12f9e50b514faf11 /drivers/char/ipmi/ipmi_si_intf.c | |
| parent | e05bd3367bd3d88715b53766f95bb3a8ec7ab59e (diff) | |
ipmi: make sure drivers were registered before unregistering them
The ipmi code will never register a PCI or Open Firmware driver if a
hardcoded device is provided by the user by providing device addresses via
the module parameters. This can cause us to attempt to unregister a
driver that was never registered, resulting in an oops. Keep track of
registration in order to avoid this.
Fixes a post-2.6.34 regression.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ipmi/ipmi_si_intf.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 35603dd4e6c5..311f85b67cc1 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -302,6 +302,12 @@ struct smi_info { | |||
| 302 | 302 | ||
| 303 | static int force_kipmid[SI_MAX_PARMS]; | 303 | static int force_kipmid[SI_MAX_PARMS]; |
| 304 | static int num_force_kipmid; | 304 | static int num_force_kipmid; |
| 305 | #ifdef CONFIG_PCI | ||
| 306 | static int pci_registered; | ||
| 307 | #endif | ||
| 308 | #ifdef CONFIG_PPC_OF | ||
| 309 | static int of_registered; | ||
| 310 | #endif | ||
| 305 | 311 | ||
| 306 | static unsigned int kipmid_max_busy_us[SI_MAX_PARMS]; | 312 | static unsigned int kipmid_max_busy_us[SI_MAX_PARMS]; |
| 307 | static int num_max_busy_us; | 313 | static int num_max_busy_us; |
| @@ -3314,6 +3320,8 @@ static __devinit int init_ipmi_si(void) | |||
| 3314 | rv = pci_register_driver(&ipmi_pci_driver); | 3320 | rv = pci_register_driver(&ipmi_pci_driver); |
| 3315 | if (rv) | 3321 | if (rv) |
| 3316 | printk(KERN_ERR PFX "Unable to register PCI driver: %d\n", rv); | 3322 | printk(KERN_ERR PFX "Unable to register PCI driver: %d\n", rv); |
| 3323 | else | ||
| 3324 | pci_registered = 1; | ||
| 3317 | #endif | 3325 | #endif |
| 3318 | 3326 | ||
| 3319 | #ifdef CONFIG_ACPI | 3327 | #ifdef CONFIG_ACPI |
| @@ -3330,6 +3338,7 @@ static __devinit int init_ipmi_si(void) | |||
| 3330 | 3338 | ||
| 3331 | #ifdef CONFIG_PPC_OF | 3339 | #ifdef CONFIG_PPC_OF |
| 3332 | of_register_platform_driver(&ipmi_of_platform_driver); | 3340 | of_register_platform_driver(&ipmi_of_platform_driver); |
| 3341 | of_registered = 1; | ||
| 3333 | #endif | 3342 | #endif |
| 3334 | 3343 | ||
| 3335 | /* We prefer devices with interrupts, but in the case of a machine | 3344 | /* We prefer devices with interrupts, but in the case of a machine |
| @@ -3383,11 +3392,13 @@ static __devinit int init_ipmi_si(void) | |||
| 3383 | if (unload_when_empty && list_empty(&smi_infos)) { | 3392 | if (unload_when_empty && list_empty(&smi_infos)) { |
| 3384 | mutex_unlock(&smi_infos_lock); | 3393 | mutex_unlock(&smi_infos_lock); |
| 3385 | #ifdef CONFIG_PCI | 3394 | #ifdef CONFIG_PCI |
| 3386 | pci_unregister_driver(&ipmi_pci_driver); | 3395 | if (pci_registered) |
| 3396 | pci_unregister_driver(&ipmi_pci_driver); | ||
| 3387 | #endif | 3397 | #endif |
| 3388 | 3398 | ||
| 3389 | #ifdef CONFIG_PPC_OF | 3399 | #ifdef CONFIG_PPC_OF |
| 3390 | of_unregister_platform_driver(&ipmi_of_platform_driver); | 3400 | if (of_registered) |
| 3401 | of_unregister_platform_driver(&ipmi_of_platform_driver); | ||
| 3391 | #endif | 3402 | #endif |
| 3392 | driver_unregister(&ipmi_driver.driver); | 3403 | driver_unregister(&ipmi_driver.driver); |
| 3393 | printk(KERN_WARNING PFX | 3404 | printk(KERN_WARNING PFX |
| @@ -3478,14 +3489,16 @@ static __exit void cleanup_ipmi_si(void) | |||
| 3478 | return; | 3489 | return; |
| 3479 | 3490 | ||
| 3480 | #ifdef CONFIG_PCI | 3491 | #ifdef CONFIG_PCI |
| 3481 | pci_unregister_driver(&ipmi_pci_driver); | 3492 | if (pci_registered) |
| 3493 | pci_unregister_driver(&ipmi_pci_driver); | ||
| 3482 | #endif | 3494 | #endif |
| 3483 | #ifdef CONFIG_ACPI | 3495 | #ifdef CONFIG_ACPI |
| 3484 | pnp_unregister_driver(&ipmi_pnp_driver); | 3496 | pnp_unregister_driver(&ipmi_pnp_driver); |
| 3485 | #endif | 3497 | #endif |
| 3486 | 3498 | ||
| 3487 | #ifdef CONFIG_PPC_OF | 3499 | #ifdef CONFIG_PPC_OF |
| 3488 | of_unregister_platform_driver(&ipmi_of_platform_driver); | 3500 | if (of_registered) |
| 3501 | of_unregister_platform_driver(&ipmi_of_platform_driver); | ||
| 3489 | #endif | 3502 | #endif |
| 3490 | 3503 | ||
| 3491 | mutex_lock(&smi_infos_lock); | 3504 | mutex_lock(&smi_infos_lock); |