Commit a78001b0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi',... 

Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm', 'asoc/fix/qcom' and 'asoc/fix/rcar' into asoc-linus
parents 1ce286b9 9d7dd6cd 28ecc0b6 aae013d6 96f05be3 d1acba2f

include/sound/designware_i2s.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

 * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

include/sound/soc.h

+12 −0
Original line number Diff line number Diff line
@@ -387,8 +387,20 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
int snd_soc_register_card(struct snd_soc_card *card);

int snd_soc_unregister_card(struct snd_soc_card *card);

int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);

#ifdef CONFIG_PM_SLEEP

int snd_soc_suspend(struct device *dev);

int snd_soc_resume(struct device *dev);

#else

static inline int snd_soc_suspend(struct device *dev)

{

	return 0;

}



static inline int snd_soc_resume(struct device *dev)

{

	return 0;

}

#endif

int snd_soc_poweroff(struct device *dev);

int snd_soc_register_platform(struct device *dev,

		const struct snd_soc_platform_driver *platform_drv);

include/sound/spear_dma.h

+1 −1
Original line number Diff line number Diff line 
/*

* linux/spear_dma.h

*

* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

sound/soc/fsl/fsl_ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	}



	ssi_private->irq = platform_get_irq(pdev, 0);

	if (!ssi_private->irq) {

	if (ssi_private->irq < 0) {

		dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);

		return ssi_private->irq;

	}

sound/soc/qcom/lpass-cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, 
		int cmd, struct snd_soc_dai *dai)

{

	struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);

	int ret;

	int ret = -EINVAL;



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START: