From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 2 Jun 2010 12:15:10 +0000 (+0200)
Subject: Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
X-Git-Tag: v2.6.35-rc2~41^2~1^2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=e4caa8bab3862a7694ab7c6dfede223227ad7fc5;hp=-c

Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
---

e4caa8bab3862a7694ab7c6dfede223227ad7fc5
diff --combined sound/pci/hda/hda_intel.c
index e42ab99,af701a8..1df25cf
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -1913,11 -1913,11 +1913,11 @@@ static int azx_position_ok(struct azx *
  	if (WARN_ONCE(!azx_dev->period_bytes,
  		      "hda-intel: zero azx_dev->period_bytes"))
  		return -1; /* this shouldn't happen! */
- 	if (wallclk <= azx_dev->period_wallclk &&
+ 	if (wallclk < (azx_dev->period_wallclk * 5) / 4 &&
  	    pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
  		/* NG - it's below the first next period boundary */
  		return bdl_pos_adj[chip->dev_index] ? 0 : -1;
- 	azx_dev->start_wallclk = wallclk;
+ 	azx_dev->start_wallclk += wallclk;
  	return 1; /* OK, it's fine */
  }
  
@@@ -2288,8 -2288,6 +2288,8 @@@ static struct snd_pci_quirk position_fi
  	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
 +	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
 +	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
@@@ -2298,7 -2296,6 +2298,7 @@@
  	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
 +	SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
  	SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
  	{}