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

Commit 71019c35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: Remove BROKEN from mpc5200 kconfig
  ASoC: TWL4030: Fix gain control for earpiece amplifier
  ALSA: pcm core - Avoid jiffies check for devices with BATCH flag
  ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers
  ALSA: indigo-express: add missing 64KHz flags
  ASoC: Set the MPC5200 i2s driver to BROKEN status.
  ASoC: Fix logic in WM8350 master clocking check
parents f83ce3e6 5d7ee52f

sound/core/pcm_lib.c

+7 −0
Original line number Diff line number Diff line
@@ -249,6 +249,12 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) 
			new_hw_ptr = hw_base + pos;

		}

	}

	/* Skip the jiffies check for hardwares with BATCH flag.

	 * Such hardware usually just increases the position at each IRQ,

	 * thus it can't give any strange position.

	 */

	if (runtime->hw.info & SNDRV_PCM_INFO_BATCH)

		goto no_jiffies_check;

	hdelta = new_hw_ptr - old_hw_ptr;

	jdelta = jiffies - runtime->hw_ptr_jiffies;

	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
@@ -272,6 +278,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) 
		hw_base -= hw_base % runtime->buffer_size;

		delta = 0;

	}

 no_jiffies_check:

	if (delta > runtime->period_size + runtime->period_size / 2) {

		hw_ptr_error(substream,

			     "Lost interrupts? "

sound/isa/msnd/msnd.c

+4 −2
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip, 
static struct snd_pcm_hardware snd_msnd_playback = {

	.info =			SNDRV_PCM_INFO_MMAP |

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_MMAP_VALID,

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_BATCH,

	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,

	.rates =		SNDRV_PCM_RATE_8000_48000,

	.rate_min =		8000,
@@ -456,7 +457,8 @@ static struct snd_pcm_hardware snd_msnd_playback = { 
static struct snd_pcm_hardware snd_msnd_capture = {

	.info =			SNDRV_PCM_INFO_MMAP |

				SNDRV_PCM_INFO_INTERLEAVED |

				SNDRV_PCM_INFO_MMAP_VALID,

				SNDRV_PCM_INFO_MMAP_VALID |

				SNDRV_PCM_INFO_BATCH,

	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,

	.rates =		SNDRV_PCM_RATE_8000_48000,

	.rate_min =		8000,

sound/pci/bt87x.c

+4 −2
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ static struct snd_pcm_hardware snd_bt87x_digital_hw = { 
	.info = SNDRV_PCM_INFO_MMAP |

		SNDRV_PCM_INFO_INTERLEAVED |

		SNDRV_PCM_INFO_BLOCK_TRANSFER |

		SNDRV_PCM_INFO_MMAP_VALID,

		SNDRV_PCM_INFO_MMAP_VALID |

		SNDRV_PCM_INFO_BATCH,

	.formats = SNDRV_PCM_FMTBIT_S16_LE,

	.rates = 0, /* set at runtime */

	.channels_min = 2,
@@ -365,7 +366,8 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = { 
	.info = SNDRV_PCM_INFO_MMAP |

		SNDRV_PCM_INFO_INTERLEAVED |

		SNDRV_PCM_INFO_BLOCK_TRANSFER |

		SNDRV_PCM_INFO_MMAP_VALID,

		SNDRV_PCM_INFO_MMAP_VALID |

		SNDRV_PCM_INFO_BATCH,

	.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8,

	.rates = SNDRV_PCM_RATE_KNOT,

	.rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX,

sound/pci/echoaudio/indigodjx.c

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { 
	.rates = 	SNDRV_PCM_RATE_32000 |

			SNDRV_PCM_RATE_44100 |

			SNDRV_PCM_RATE_48000 |

			SNDRV_PCM_RATE_64000 |

			SNDRV_PCM_RATE_88200 |

			SNDRV_PCM_RATE_96000,

	.rate_min = 32000,

sound/pci/echoaudio/indigoiox.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { 
	.rates = 	SNDRV_PCM_RATE_32000 |

			SNDRV_PCM_RATE_44100 |

			SNDRV_PCM_RATE_48000 |

			SNDRV_PCM_RATE_64000 |

			SNDRV_PCM_RATE_88200 |

			SNDRV_PCM_RATE_96000,

	.rate_min = 32000,