diff --git a/[refs] b/[refs]
index 481d3b8e1b88..5d2eccd2e4fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 591e610d651079117bd71c625605a3ebd868b1a1
+refs/heads/master: 314c3ff47643c7c1f11317f81a80902af80795e3
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index ecadb5b7d647..0c1996dd137b 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -2370,11 +2370,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 	case AZX_DRIVER_ATI:
 		/* Use link position directly, avoid any transfer problem. */
 		return POS_FIX_VIACOMBO;
-	case AZX_DRIVER_GENERIC:
-		/* AMD chipsets behave often badly, too */
-		if (chip->pci->vendor == PCI_VENDOR_ID_AMD)
-			return POS_FIX_VIACOMBO;
-		break;
 	}
 
 	return POS_FIX_AUTO;