ASoC: sh: fsi: enable chip specific data transfer mode

[~andy/linux] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 02db2c09076b84eab8ea0b09e3bad30646eefc4f..90ee77d2409da8402ea58026b788a624f850a25a 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -68,6 +68,7 @@ static int dapm_up_seq[] = {
        [snd_soc_dapm_out_drv] = 10,
        [snd_soc_dapm_hp] = 10,
        [snd_soc_dapm_spk] = 10,
+       [snd_soc_dapm_line] = 10,
        [snd_soc_dapm_post] = 11,
 };
 
@@ -76,6 +77,7 @@ static int dapm_down_seq[] = {
        [snd_soc_dapm_adc] = 1,
        [snd_soc_dapm_hp] = 2,
        [snd_soc_dapm_spk] = 2,
+       [snd_soc_dapm_line] = 2,
        [snd_soc_dapm_out_drv] = 2,
        [snd_soc_dapm_pga] = 4,
        [snd_soc_dapm_mixer_named_ctl] = 5,
@@ -2989,7 +2991,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
        struct snd_soc_dai *source, *sink;
        const struct snd_soc_pcm_stream *config = w->params;
        struct snd_pcm_substream substream;
-       struct snd_pcm_hw_params params;
+       struct snd_pcm_hw_params *params = NULL;
        u64 fmt;
        int ret;
 
@@ -3019,17 +3021,21 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
        }
 
        /* Currently very limited parameter selection */
-       memset(&params, 0, sizeof(params));
-       snd_mask_set(hw_param_mask(&params, SNDRV_PCM_HW_PARAM_FORMAT), fmt);
+       params = kzalloc(sizeof(*params), GFP_KERNEL);
+       if (!params) {
+               ret = -ENOMEM;
+               goto out;
+       }
+       snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt);
 
-       hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->min =
+       hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min =
                config->rate_min;
-       hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->max =
+       hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max =
                config->rate_max;
 
-       hw_param_interval(&params, SNDRV_PCM_HW_PARAM_CHANNELS)->min
+       hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min
                = config->channels_min;
-       hw_param_interval(&params, SNDRV_PCM_HW_PARAM_CHANNELS)->max
+       hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max
                = config->channels_max;
 
        memset(&substream, 0, sizeof(substream));
@@ -3039,22 +3045,22 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                if (source->driver->ops && source->driver->ops->hw_params) {
                        substream.stream = SNDRV_PCM_STREAM_CAPTURE;
                        ret = source->driver->ops->hw_params(&substream,
-                                                            &params, source);
+                                                            params, source);
                        if (ret != 0) {
                                dev_err(source->dev,
                                        "hw_params() failed: %d\n", ret);
-                               return ret;
+                               goto out;
                        }
                }
 
                if (sink->driver->ops && sink->driver->ops->hw_params) {
                        substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
-                       ret = sink->driver->ops->hw_params(&substream, &params,
+                       ret = sink->driver->ops->hw_params(&substream, params,
                                                           sink);
                        if (ret != 0) {
                                dev_err(sink->dev,
                                        "hw_params() failed: %d\n", ret);
-                               return ret;
+                               goto out;
                        }
                }
                break;
@@ -3063,12 +3069,14 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                ret = snd_soc_dai_digital_mute(sink, 0);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "Failed to unmute: %d\n", ret);
+               ret = 0;
                break;
 
        case SND_SOC_DAPM_PRE_PMD:
                ret = snd_soc_dai_digital_mute(sink, 1);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "Failed to mute: %d\n", ret);
+               ret = 0;
                break;
 
        default:
@@ -3076,7 +3084,9 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                return -EINVAL;
        }
 
-       return 0;
+out:
+       kfree(params);
+       return ret;
 }
 
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,