diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 13:12:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 13:12:28 -0500 |
| commit | e99cc290cae141853bcd901e4c7038fe686cc46d (patch) | |
| tree | a1562c313f8459790ff7141be707656e1498fe84 /sound | |
| parent | 26b23ace8b54d836763bad3495fe8ed1a9d4354d (diff) | |
| parent | d6d8bf549393484e906913f02fa3c9518a2819b6 (diff) | |
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - use WARN_ON_ONCE() for zero-division detection
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e767c3f395ab..3600e9cc9bc6 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -1893,12 +1893,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) | |||
| 1893 | 1893 | ||
| 1894 | if (!bdl_pos_adj[chip->dev_index]) | 1894 | if (!bdl_pos_adj[chip->dev_index]) |
| 1895 | return 1; /* no delayed ack */ | 1895 | return 1; /* no delayed ack */ |
| 1896 | if (azx_dev->period_bytes == 0) { | 1896 | if (WARN_ONCE(!azx_dev->period_bytes, |
| 1897 | printk(KERN_WARNING | 1897 | "hda-intel: zero azx_dev->period_bytes")) |
| 1898 | "hda-intel: Divide by zero was avoided " | 1898 | return 0; /* this shouldn't happen! */ |
| 1899 | "in azx_dev->period_bytes.\n"); | ||
| 1900 | return 0; | ||
| 1901 | } | ||
| 1902 | if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) | 1899 | if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) |
| 1903 | return 0; /* NG - it's below the period boundary */ | 1900 | return 0; /* NG - it's below the period boundary */ |
| 1904 | return 1; /* OK, it's fine */ | 1901 | return 1; /* OK, it's fine */ |