diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
| commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
| tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /sound | |
| parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
| parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e42ab999d0f2..1df25cf5ce38 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -1913,11 +1913,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) | |||
| 1913 | if (WARN_ONCE(!azx_dev->period_bytes, | 1913 | if (WARN_ONCE(!azx_dev->period_bytes, |
| 1914 | "hda-intel: zero azx_dev->period_bytes")) | 1914 | "hda-intel: zero azx_dev->period_bytes")) |
| 1915 | return -1; /* this shouldn't happen! */ | 1915 | return -1; /* this shouldn't happen! */ |
| 1916 | if (wallclk <= azx_dev->period_wallclk && | 1916 | if (wallclk < (azx_dev->period_wallclk * 5) / 4 && |
| 1917 | pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) | 1917 | pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) |
| 1918 | /* NG - it's below the first next period boundary */ | 1918 | /* NG - it's below the first next period boundary */ |
| 1919 | return bdl_pos_adj[chip->dev_index] ? 0 : -1; | 1919 | return bdl_pos_adj[chip->dev_index] ? 0 : -1; |
| 1920 | azx_dev->start_wallclk = wallclk; | 1920 | azx_dev->start_wallclk += wallclk; |
| 1921 | return 1; /* OK, it's fine */ | 1921 | return 1; /* OK, it's fine */ |
| 1922 | } | 1922 | } |
| 1923 | 1923 | ||