diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:28:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:28:57 -0400 |
| commit | 69cd291c6bbc6647fe3783257c5a2e076e808f71 (patch) | |
| tree | 6f65a2d7d29228129cef09343c485aad64e3a3f1 /drivers/char | |
| parent | 35a5d9ed9fedb74c22cb19ff7d749289473144e0 (diff) | |
| parent | 06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea (diff) | |
| download | linux-3.10-69cd291c6bbc6647fe3783257c5a2e076e808f71.tar.gz linux-3.10-69cd291c6bbc6647fe3783257c5a2e076e808f71.tar.bz2 linux-3.10-69cd291c6bbc6647fe3783257c5a2e076e808f71.zip | |
Pull acpi_bus_register_driver into release branch
Conflicts:
drivers/acpi/asus_acpi.c
drivers/acpi/scan.c
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sonypi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index a90f5d97df3..43dfd8689dc 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -512,7 +512,7 @@ static struct sonypi_device { #ifdef CONFIG_ACPI static struct acpi_device *sonypi_acpi_device; -static int acpi_enabled; +static int acpi_driver_registered; #endif static int sonypi_ec_write(u8 addr, u8 value) @@ -869,7 +869,7 @@ found: sonypi_report_input_event(event); #ifdef CONFIG_ACPI - if (acpi_enabled) + if (sonypi_acpi_device) acpi_bus_generate_event(sonypi_acpi_device, 1, event); #endif @@ -1551,8 +1551,8 @@ static int __init sonypi_init(void) goto err_free_device; #ifdef CONFIG_ACPI - if (acpi_bus_register_driver(&sonypi_acpi_driver) > 0) - acpi_enabled = 1; + if (acpi_bus_register_driver(&sonypi_acpi_driver) >= 0) + acpi_driver_registered = 1; #endif return 0; @@ -1567,7 +1567,7 @@ static int __init sonypi_init(void) static void __exit sonypi_exit(void) { #ifdef CONFIG_ACPI - if (acpi_enabled) + if (acpi_driver_registered) acpi_bus_unregister_driver(&sonypi_acpi_driver); #endif platform_device_unregister(sonypi_platform_device); |