leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/nouveau/led: prevent compiling the led-code if nouveau=y and leds=m

Browse Source 
The proper fix would have been to select LEDS_CLASS but this can lead
to a circular dependency, as found out by Arnd.

This patch implements Arnd's suggestion instead, at the cost of some
auto-magic for a fringe feature.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Intel's 0-DAY
Fixes: 8d021d71b3 ("drm/nouveau/drm/nouveau: add a LED driver for the NVIDIA logo")
Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Martin Peres 2016-12-07 06:30:15 +02:00 committed by Ben Skeggs
parent 7dfee68277
commit d72498ca2c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_led.h
View File

@ -42,7 +42,7 @@ nouveau_led(struct drm_device *dev)
} }
/* nouveau_led.c */ /* nouveau_led.c */
#if IS_ENABLED(CONFIG_LEDS_CLASS) #if IS_REACHABLE(CONFIG_LEDS_CLASS)
int nouveau_led_init(struct drm_device *dev); int nouveau_led_init(struct drm_device *dev);
void nouveau_led_suspend(struct drm_device *dev); void nouveau_led_suspend(struct drm_device *dev);
void nouveau_led_resume(struct drm_device *dev); void nouveau_led_resume(struct drm_device *dev);