diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /drivers/acpi/ac.c | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/ac.c')
| -rw-r--r-- | drivers/acpi/ac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 8711e3797165..3c2e4aa529c4 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
| @@ -207,7 +207,7 @@ static int acpi_ac_probe(struct platform_device *pdev) | |||
| 207 | goto end; | 207 | goto end; |
| 208 | 208 | ||
| 209 | result = acpi_install_notify_handler(ACPI_HANDLE(&pdev->dev), | 209 | result = acpi_install_notify_handler(ACPI_HANDLE(&pdev->dev), |
| 210 | ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler, ac); | 210 | ACPI_ALL_NOTIFY, acpi_ac_notify_handler, ac); |
| 211 | if (result) { | 211 | if (result) { |
| 212 | power_supply_unregister(&ac->charger); | 212 | power_supply_unregister(&ac->charger); |
| 213 | goto end; | 213 | goto end; |
| @@ -255,7 +255,7 @@ static int acpi_ac_remove(struct platform_device *pdev) | |||
| 255 | return -EINVAL; | 255 | return -EINVAL; |
| 256 | 256 | ||
| 257 | acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev), | 257 | acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev), |
| 258 | ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler); | 258 | ACPI_ALL_NOTIFY, acpi_ac_notify_handler); |
| 259 | 259 | ||
| 260 | ac = platform_get_drvdata(pdev); | 260 | ac = platform_get_drvdata(pdev); |
| 261 | if (ac->charger.dev) | 261 | if (ac->charger.dev) |