Skip to content

Commit

Permalink
apple_gmux: Fix ACPI video unregister
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Garrett committed Aug 17, 2012
1 parent 96ff705 commit 9f6f955
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/platform/x86/apple-gmux.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
* Disable the other backlight choices.
*/
acpi_video_dmi_promote_vendor();
#ifdef CONFIG_ACPI_VIDEO
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_unregister();
#endif
apple_bl_unregister();
Expand All @@ -371,7 +371,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp)
kfree(gmux_data);

acpi_video_dmi_demote_vendor();
#ifdef CONFIG_ACPI_VIDEO
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_register();
#endif
apple_bl_register();
Expand Down

0 comments on commit 9f6f955

Please sign in to comment.