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

Commit 3f42c000 authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

ASoC: dapm: Adapt for debugfs API change 



commit ceaea851b9ea75f9ea2bbefb53ff0d4b27cd5a6e upstream.

Back in ff9fb72bc07705c (debugfs: return error values, not NULL) the
debugfs APIs were changed to return error pointers rather than NULL
pointers on error, breaking the error checking in ASoC. Update the
code to use IS_ERR() and log the codes that are returned as part of
the error messages.

Fixes: ff9fb72bc07705c (debugfs: return error values, not NULL)
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 677b2aa3

sound/soc/soc-dapm.c

+10 −8
Original line number Diff line number Diff line
@@ -2139,23 +2139,25 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, 
{

	struct dentry *d;



	if (!parent)

	if (!parent || IS_ERR(parent))

		return;



	dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);



	if (!dapm->debugfs_dapm) {

	if (IS_ERR(dapm->debugfs_dapm)) {

		dev_warn(dapm->dev,

		       "ASoC: Failed to create DAPM debugfs directory\n");

			 "ASoC: Failed to create DAPM debugfs directory %ld\n",

			 PTR_ERR(dapm->debugfs_dapm));

		return;

	}



	d = debugfs_create_file("bias_level", 0444,

				dapm->debugfs_dapm, dapm,

				&dapm_bias_fops);

	if (!d)

	if (IS_ERR(d))

		dev_warn(dapm->dev,

			 "ASoC: Failed to create bias level debugfs file\n");

			 "ASoC: Failed to create bias level debugfs file: %ld\n",

			 PTR_ERR(d));

}



static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
@@ -2169,10 +2171,10 @@ static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w) 
	d = debugfs_create_file(w->name, 0444,

				dapm->debugfs_dapm, w,

				&dapm_widget_power_fops);

	if (!d)

	if (IS_ERR(d))

		dev_warn(w->dapm->dev,

			"ASoC: Failed to create %s debugfs file\n",

			w->name);

			 "ASoC: Failed to create %s debugfs file: %ld\n",

			 w->name, PTR_ERR(d));

}



static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)