summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-17 14:08:58 -0800
committerTony Lindgren <tony@atomide.com>2010-02-17 14:08:58 -0800
commit80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch)
tree364017b2c001939bbb645dcc20d565c1f71b13a8 /sound
parentd6a2d9b800276140abf352908abbd0c240890692 (diff)
parentb72c7d543589736d43da531566490dd31572f5ca (diff)
downloadlinux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.bz2
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b8faa6dc5abe..3600e9cc9bc6 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1893,6 +1893,9 @@ 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 (WARN_ONCE(!azx_dev->period_bytes,
+ "hda-intel: zero azx_dev->period_bytes"))
+ return 0; /* this shouldn't happen! */
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 */