diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-02-09 23:34:18 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-02-09 23:34:18 +0300 |
commit | b2d6efe7fa18ad14ee6e9964c90643095b6ac7e2 (patch) | |
tree | 112e13bf1e195d7e2d43cc41390ec9b1222eddb8 /sound/pci | |
parent | dce17d4ff366230aeeaaf42512bba3711243cf1c (diff) | |
parent | fed08d036f2aabd8d0c684439de37f8ebec2bbc2 (diff) | |
download | linux-b2d6efe7fa18ad14ee6e9964c90643095b6ac7e2.tar.xz |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 353412bb5ccb..06f230f518b7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1892,6 +1892,12 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) if (!bdl_pos_adj[chip->dev_index]) return 1; /* no delayed ack */ + if (azx_dev->period_bytes == 0) { + printk(KERN_WARNING + "hda-intel: Divide by zero was avoided " + "in azx_dev->period_bytes.\n"); + return 0; + } if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) return 0; /* NG - it's below the period boundary */ return 1; /* OK, it's fine */ |