[alsa-devel] [PATCH 0/1] ASoC: DAPM: Fix for line widget handling
Hello,
The following patch fixes the handling of the line widget, which can be input or output.
Additional check is added to is_connected_output_ep and is_connected_input_ep functions when the line widget is checked to handle only the appropriate line widget.
Without the patch these two functions would pick up either line widgets, which confused DAPM.
Note: checkpach complains for the long lines, but I feel that it is appropriate here to use the long lines.
--- Peter Ujfalusi (1): ASoC: Fix SND_SOC_DAPM_LINE handling
sound/soc/soc-dapm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
Since the SND_SOC_DAPM_LINE can be input or output, additional check is needed in order to determine if the widget is connected as input or output. When checking for connected outputs, if the widget is line, than check if the sources list is not empty (line is connected as output) For input endpoint check, when the widget is line, also check if the sinks list is not empty (line is connected as input).
Signed-off-by: Peter Ujfalusi peter.ujfalusi@nokia.com --- sound/soc/soc-dapm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9babda5..8eaf1b6 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -524,7 +524,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget)
/* connected jack or spk ? */ if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_spk || - widget->id == snd_soc_dapm_line) + (widget->id == snd_soc_dapm_line && !list_empty(&widget->sources))) return 1; }
@@ -573,7 +573,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) return 1;
/* connected jack ? */ - if (widget->id == snd_soc_dapm_mic || widget->id == snd_soc_dapm_line) + if (widget->id == snd_soc_dapm_mic || + (widget->id == snd_soc_dapm_line && !list_empty(&widget->sinks))) return 1; }
On Wed, Sep 30, 2009 at 09:27:24AM +0300, Peter Ujfalusi wrote:
Since the SND_SOC_DAPM_LINE can be input or output, additional check is needed in order to determine if the widget is connected as input or output.
Applied, thanks.
Incidentally, there's usually no need to send a cover letter with single patches - normally you can just cover everything in the commit message. If there's stuff that shouldn't be in the commit message add it after the '---' and tools like git am will drop it automatically.
participants (2)
-
Mark Brown
-
Peter Ujfalusi