Skip to content

Commit 9f6f955

Browse files
author
Matthew Garrett
committed
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 <[email protected]>
1 parent 96ff705 commit 9f6f955

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/platform/x86/apple-gmux.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
348348
* Disable the other backlight choices.
349349
*/
350350
acpi_video_dmi_promote_vendor();
351-
#ifdef CONFIG_ACPI_VIDEO
351+
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
352352
acpi_video_unregister();
353353
#endif
354354
apple_bl_unregister();
@@ -371,7 +371,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp)
371371
kfree(gmux_data);
372372

373373
acpi_video_dmi_demote_vendor();
374-
#ifdef CONFIG_ACPI_VIDEO
374+
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
375375
acpi_video_register();
376376
#endif
377377
apple_bl_register();

0 commit comments

Comments
 (0)