Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c975f17d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2018-04-04' of... 

Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas)

Cc: Lukas Wunner <lukas@wunner.de>
Cc: Takashi Iwai <tiwai@suse.de>

* tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc:
  ALSA: hda - Silence PM ops build warning
parents 694f54f6 8cd1b5bd

sound/pci/hda/hda_intel.c

+1 −3
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ static int param_set_xint(const char *val, const struct kernel_param *kp) 
#define azx_del_card_list(chip) /* NOP */

#endif /* CONFIG_PM */



#if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)

#ifdef CONFIG_PM_SLEEP

/*

 * power management

 */
@@ -1068,9 +1068,7 @@ static int azx_resume(struct device *dev) 
	trace_azx_resume(chip);

	return 0;

}

#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */



#ifdef CONFIG_PM_SLEEP

/* put codec down to D3 at hibernation for Intel SKL+;

 * otherwise BIOS may still access the codec and screw up the driver

 */