Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm', 'asoc/fix/qcom' and 'asoc/fix/rcar' into asoc-linus
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -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_register_card(struct snd_soc_card *card);
|
||||||
int snd_soc_unregister_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);
|
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_suspend(struct device *dev);
|
||||||
int snd_soc_resume(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_poweroff(struct device *dev);
|
||||||
int snd_soc_register_platform(struct device *dev,
|
int snd_soc_register_platform(struct device *dev,
|
||||||
const struct snd_soc_platform_driver *platform_drv);
|
const struct snd_soc_platform_driver *platform_drv);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* linux/spear_dma.h
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1357,7 +1357,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ssi_private->irq = platform_get_irq(pdev, 0);
|
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);
|
dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
|
||||||
return ssi_private->irq;
|
return ssi_private->irq;
|
||||||
}
|
}
|
||||||
|
@ -194,7 +194,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
|
|||||||
int cmd, struct snd_soc_dai *dai)
|
int cmd, struct snd_soc_dai *dai)
|
||||||
{
|
{
|
||||||
struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
|
struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
|
||||||
int ret;
|
int ret = -EINVAL;
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case SNDRV_PCM_TRIGGER_START:
|
case SNDRV_PCM_TRIGGER_START:
|
||||||
|
@ -156,6 +156,7 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
|
|||||||
(void *)id);
|
(void *)id);
|
||||||
}
|
}
|
||||||
if (IS_ERR_OR_NULL(dmaen->chan)) {
|
if (IS_ERR_OR_NULL(dmaen->chan)) {
|
||||||
|
dmaen->chan = NULL;
|
||||||
dev_err(dev, "can't get dma channel\n");
|
dev_err(dev, "can't get dma channel\n");
|
||||||
goto rsnd_dma_channel_err;
|
goto rsnd_dma_channel_err;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user