diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-08-17 16:57:20 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-08-17 17:34:39 -0400 |
| commit | 9f6f955ae4994dd4ad5513a0d959468763a45fa5 (patch) | |
| tree | 35cc385e9e515a2b2981490117c30c976b8a0e09 /drivers/platform | |
| parent | 96ff705638e3d61b1e45a047c0f9f3bb622fa32f (diff) | |
apple_gmux: Fix ACPI video unregister
We were only calling acpi_video_unregister() if ACPI video support was built
in, not if it was a module.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/apple-gmux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index 0d140e1879e7..85e1bfbd1121 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c | |||
| @@ -348,7 +348,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, | |||
| 348 | * Disable the other backlight choices. | 348 | * Disable the other backlight choices. |
| 349 | */ | 349 | */ |
| 350 | acpi_video_dmi_promote_vendor(); | 350 | acpi_video_dmi_promote_vendor(); |
| 351 | #ifdef CONFIG_ACPI_VIDEO | 351 | #if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) |
| 352 | acpi_video_unregister(); | 352 | acpi_video_unregister(); |
| 353 | #endif | 353 | #endif |
| 354 | apple_bl_unregister(); | 354 | apple_bl_unregister(); |
| @@ -371,7 +371,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp) | |||
| 371 | kfree(gmux_data); | 371 | kfree(gmux_data); |
| 372 | 372 | ||
| 373 | acpi_video_dmi_demote_vendor(); | 373 | acpi_video_dmi_demote_vendor(); |
| 374 | #ifdef CONFIG_ACPI_VIDEO | 374 | #if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) |
| 375 | acpi_video_register(); | 375 | acpi_video_register(); |
| 376 | #endif | 376 | #endif |
| 377 | apple_bl_register(); | 377 | apple_bl_register(); |