diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-07-06 17:42:32 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-07-06 17:42:32 -0400 |
commit | ec8e11d4d67de07e87deed27d59b0fad105853fe (patch) | |
tree | 0a161560b99142c86b46c7ce74c4f96a24ad2d1e /drivers/edac/sb_edac.c | |
parent | 0d2f57e8256e6fc4e4d4d9c28f97eff81274fbc9 (diff) | |
parent | 1990855918045c6bd2c8b7ad62917d141eed4332 (diff) |
Merge tag 'v3.2.22' into v3.2-rt
This is the 3.2.22 stable release
Diffstat (limited to 'drivers/edac/sb_edac.c')
-rw-r--r-- | drivers/edac/sb_edac.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 7a402bfbee7d..18a129391c0f 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -1661,9 +1661,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev) debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", __func__, mci, &sbridge_dev->pdev[0]->dev); - atomic_notifier_chain_unregister(&x86_mce_decoder_chain, - &sbridge_mce_dec); - /* Remove MC sysfs nodes */ edac_mc_del_mc(mci->dev); @@ -1731,8 +1728,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev) goto fail0; } - atomic_notifier_chain_register(&x86_mce_decoder_chain, - &sbridge_mce_dec); return 0; fail0: @@ -1861,8 +1856,10 @@ static int __init sbridge_init(void) pci_rc = pci_register_driver(&sbridge_driver); - if (pci_rc >= 0) + if (pci_rc >= 0) { + atomic_notifier_chain_register(&x86_mce_decoder_chain, &sbridge_mce_dec); return 0; + } sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n", pci_rc); @@ -1878,6 +1875,7 @@ static void __exit sbridge_exit(void) { debugf2("MC: " __FILE__ ": %s()\n", __func__); pci_unregister_driver(&sbridge_driver); + atomic_notifier_chain_unregister(&x86_mce_decoder_chain, &sbridge_mce_dec); } module_init(sbridge_init); |