From 40d6537001042a605f2c12d8cb2fb70f8d4e3725 Mon Sep 17 00:00:00 2001 From: Xiong Zhang Date: Thu, 28 May 2015 15:26:52 +0800 Subject: [PATCH] UBUNTU: SAUCE: Correct skylake and braswell identification for hda driver BugLink: http://bugs.launchpad.net/bugs/1457369 Signed-off-by: Xiong Zhang --- sound/pci/hda/hda_intel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 9ae3508..e5ceaf5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1153,8 +1153,8 @@ static int azx_free(struct azx *chip) #ifdef CONFIG_SND_HDA_PATCH_LOADER release_firmware(chip->fw); #endif - if ((chip->driver_caps & AZX_DCAPS_INTEL_SKYLAKE) || \ - (chip->driver_caps & AZX_DCAPS_INTEL_BRASWELL)) { + if ((chip->driver_caps & AZX_DCAPS_INTEL_SKYLAKE) == AZX_DCAPS_INTEL_SKYLAKE || \ + (chip->driver_caps & AZX_DCAPS_INTEL_BRASWELL) == AZX_DCAPS_INTEL_BRASWELL) { hda_display_power(false); hda_i915_exit_bpo(); } else if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { @@ -1918,8 +1918,8 @@ static int azx_probe_continue(struct azx *chip) /* Request power well for Haswell HDA controller and codec */ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { #ifdef CONFIG_SND_HDA_I915 - if ((chip->driver_caps & AZX_DCAPS_INTEL_SKYLAKE) || \ - (chip->driver_caps & AZX_DCAPS_INTEL_BRASWELL)) + if ((chip->driver_caps & AZX_DCAPS_INTEL_SKYLAKE) == AZX_DCAPS_INTEL_SKYLAKE || \ + (chip->driver_caps & AZX_DCAPS_INTEL_BRASWELL) == AZX_DCAPS_INTEL_BRASWELL) err = hda_i915_init_bpo(); else err = hda_i915_init(); -- 1.7.9.5