From 479f0e841d51f81ef742779a1c4cbecffd7a7073 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 10 Oct 2012 09:12:01 +0200 Subject: [PATCH] --- yaml --- r: 333719 b: refs/heads/master c: 7fd5b1eb822e92ccbdb61325380b1fc429c8c993 h: refs/heads/master i: 333717: c011678f29a12efc7a9cb20150c9d8bba90cee0e 333715: 080998cb85c3de046b3134845c923f8a9b1d1041 333711: 1a4301943e89d88fa808f8d2207b7eff2649755c v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_intel.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 01dcb4532dff..23a7a7944d78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12f1771709ea53f11cf633c065d6160769795f24 +refs/heads/master: 7fd5b1eb822e92ccbdb61325380b1fc429c8c993 diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c index f09ff6c14041..6833835a218b 100644 --- a/trunk/sound/pci/hda/hda_intel.c +++ b/trunk/sound/pci/hda/hda_intel.c @@ -554,7 +554,6 @@ enum { #define AZX_DCAPS_BUFSIZE (1 << 21) /* no buffer size alignment */ #define AZX_DCAPS_ALIGN_BUFSIZE (1 << 22) /* buffer size alignment */ #define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23) /* BDLE in 4k boundary */ -#define AZX_DCAPS_POSFIX_COMBO (1 << 24) /* Use COMBO as default */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */ /* quirks for ATI SB / AMD Hudson */ @@ -2858,10 +2857,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix) snd_printd(SFX "Using LPIB position fix\n"); return POS_FIX_LPIB; } - if (chip->driver_caps & AZX_DCAPS_POSFIX_COMBO) { - snd_printd(SFX "Using COMBO position fix\n"); - return POS_FIX_COMBO; - } return POS_FIX_AUTO; }