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

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

Merge branch 'for-linus' into for-next 



Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 099d53c3 535b6c51

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -7665,23 +7665,28 @@ S: Supported 
F:	Documentation/hwmon/wm83??

F:	arch/arm/mach-s3c64xx/mach-crag6410*

F:	drivers/clk/clk-wm83*.c

F:	drivers/extcon/extcon-arizona.c

F:	drivers/leds/leds-wm83*.c

F:	drivers/gpio/gpio-*wm*.c

F:	drivers/gpio/gpio-arizona.c

F:	drivers/hwmon/wm83??-hwmon.c

F:	drivers/input/misc/wm831x-on.c

F:	drivers/input/touchscreen/wm831x-ts.c

F:	drivers/input/touchscreen/wm97*.c

F:	drivers/mfd/wm8*.c

F:	drivers/mfd/arizona*

F:	drivers/mfd/wm*.c

F:	drivers/power/wm83*.c

F:	drivers/rtc/rtc-wm83*.c

F:	drivers/regulator/wm8*.c

F:	drivers/video/backlight/wm83*_bl.c

F:	drivers/watchdog/wm83*_wdt.c

F:	include/linux/mfd/arizona/

F:	include/linux/mfd/wm831x/

F:	include/linux/mfd/wm8350/

F:	include/linux/mfd/wm8400*

F:	include/linux/wm97xx.h

F:	include/sound/wm????.h

F:	sound/soc/codecs/arizona.?

F:	sound/soc/codecs/wm*



WORKQUEUE

include/sound/pcm.h

+2 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,8 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) 
const char *snd_pcm_format_name(snd_pcm_format_t format);



/**

 * Get a string naming the direction of a stream

 * snd_pcm_stream_str - Get a string naming the direction of a stream

 * @substream: the pcm substream instance

 */

static inline const char *snd_pcm_stream_str(struct snd_pcm_substream *substream)

{

sound/arm/pxa2xx-ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = { 
	.prepare		= pxa2xx_ac97_pcm_prepare,

};



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP



static int pxa2xx_ac97_do_suspend(struct snd_card *card)

{
@@ -243,7 +243,7 @@ static struct platform_driver pxa2xx_ac97_driver = { 
	.driver		= {

		.name	= "pxa2xx-ac97",

		.owner	= THIS_MODULE,

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

		.pm	= &pxa2xx_ac97_pm_ops,

#endif

	},

sound/atmel/abdac.c

+2 −1
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) 
	dac->regs = ioremap(regs->start, resource_size(regs));

	if (!dac->regs) {

		dev_dbg(&pdev->dev, "could not remap register memory\n");

		retval = -ENOMEM;

		goto out_free_card;

	}
@@ -534,7 +535,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) 
	return retval;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int atmel_abdac_suspend(struct device *pdev)

{

	struct snd_card *card = dev_get_drvdata(pdev);

sound/atmel/ac97c.c

+5 −9
Original line number Diff line number Diff line
@@ -278,14 +278,9 @@ static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream, 
	if (retval < 0)

		return retval;

	/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */

	if (cpu_is_at32ap7000()) {

		if (retval < 0)

			return retval;

		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */

		if (retval == 1)

	if (cpu_is_at32ap7000() && retval == 1)

		if (test_and_clear_bit(DMA_RX_READY, &chip->flags))

			dw_dma_cyclic_free(chip->dma.rx_chan);

	}



	/* Set restrictions to params. */

	mutex_lock(&opened_mutex);
@@ -980,6 +975,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev) 


	if (!chip->regs) {

		dev_dbg(&pdev->dev, "could not remap register memory\n");

		retval = -ENOMEM;

		goto err_ioremap;

	}
@@ -1134,7 +1130,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev) 
	return retval;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int atmel_ac97c_suspend(struct device *pdev)

{

	struct snd_card *card = dev_get_drvdata(pdev);