diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-21 05:38:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-21 05:38:43 +0300 |
| commit | 7a68ada6ec7d88c68057d3a4c2a517eb94289976 (patch) | |
| tree | 51cd586e74fc92bfbdf382fa1544a235d908b25c /drivers/acpi/nfit/core.c | |
| parent | 760446f967678e14ee1b6464ee1bb8562f299fa6 (diff) | |
| parent | 96080f697786e0a30006fcbcc5b53f350fcb3e9f (diff) | |
| download | linux-7a68ada6ec7d88c68057d3a4c2a517eb94289976.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/acpi/nfit/core.c')
| -rw-r--r-- | drivers/acpi/nfit/core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index b75b734ee73a..19182d091587 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3160,6 +3160,8 @@ static struct acpi_driver acpi_nfit_driver = { static __init int nfit_init(void) { + int ret; + BUILD_BUG_ON(sizeof(struct acpi_table_nfit) != 40); BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 56); BUILD_BUG_ON(sizeof(struct acpi_nfit_memory_map) != 48); @@ -3187,8 +3189,14 @@ static __init int nfit_init(void) return -ENOMEM; nfit_mce_register(); + ret = acpi_bus_register_driver(&acpi_nfit_driver); + if (ret) { + nfit_mce_unregister(); + destroy_workqueue(nfit_wq); + } + + return ret; - return acpi_bus_register_driver(&acpi_nfit_driver); } static __exit void nfit_exit(void) |