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

Commit cc99a086 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into topic/misc

parents bc3a8a01 382225e6

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ Conexant 5066 
=============

  laptop	Basic Laptop config (default)

  hp-laptop	HP laptops, e g G60

  asus		Asus K52JU, Lenovo G560

  dell-laptop	Dell laptops

  dell-vostro	Dell Vostro

  olpc-xo-1_5	OLPC XO 1.5

sound/atmel/ac97c.c

+4 −1
Original line number Diff line number Diff line
@@ -33,9 +33,12 @@ 
#include <linux/dw_dmac.h>



#include <mach/cpu.h>

#include <mach/hardware.h>

#include <mach/gpio.h>



#ifdef CONFIG_ARCH_AT91

#include <mach/hardware.h>

#endif



#include "ac97c.h"



enum {

sound/core/hrtimer.c

+4 −3
Original line number Diff line number Diff line
@@ -45,12 +45,13 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) 
{

	struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt);

	struct snd_timer *t = stime->timer;

	unsigned long oruns;



	if (!atomic_read(&stime->running))

		return HRTIMER_NORESTART;



	hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));

	snd_timer_interrupt(stime->timer, t->sticks);

	oruns = hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));

	snd_timer_interrupt(stime->timer, t->sticks * oruns);



	if (!atomic_read(&stime->running))

		return HRTIMER_NORESTART;
@@ -104,7 +105,7 @@ static int snd_hrtimer_stop(struct snd_timer *t) 
}



static struct snd_timer_hardware hrtimer_hw = {

	.flags =	SNDRV_TIMER_HW_AUTO,

	.flags =	SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_TASKLET,

	.open =		snd_hrtimer_open,

	.close =	snd_hrtimer_close,

	.start =	snd_hrtimer_start,

sound/core/jack.c

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 


fail_input:

	input_free_device(jack->input_dev);

	kfree(jack->id);

	kfree(jack);

	return err;

}

sound/drivers/mtpav.c

+1 −2
Original line number Diff line number Diff line
@@ -55,14 +55,13 @@ 
#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/ioport.h>

#include <linux/io.h>

#include <linux/moduleparam.h>

#include <sound/core.h>

#include <sound/initval.h>

#include <sound/rawmidi.h>

#include <linux/delay.h>



#include <asm/io.h>



/*

 *      globals

 */