Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e99cc290 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 26b23ace d6d8bf54

sound/pci/hda/hda_intel.c

+3 −6
Original line number Diff line number Diff line
@@ -1893,12 +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 (azx_dev->period_bytes == 0) {

		printk(KERN_WARNING

		       "hda-intel: Divide by zero was avoided "

		       "in azx_dev->period_bytes.\n");

		return 0;

	}

	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 */