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

Commit 4dc2ec09 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents 1f26cb92 a9605391

sound/core/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config SND_TIMER 
config SND_PCM

	tristate

	select SND_TIMER

	select GCD



config SND_HWDEP

	tristate

sound/core/pcm_timer.c

+1 −16
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */



#include <linux/time.h>

#include <linux/gcd.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/timer.h>
@@ -28,22 +29,6 @@ 
 *  Timer functions

 */



/* Greatest common divisor */

static unsigned long gcd(unsigned long a, unsigned long b)

{

	unsigned long r;

	if (a < b) {

		r = a;

		a = b;

		b = r;

	}

	while ((r = a % b) != 0) {

		a = b;

		b = r;

	}

	return b;

}



void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)

{

	unsigned long rate, mult, fsize, l, post;