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

Commit 9b567417 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/pcm' of... 

Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
parents 42d9653e f1e3f409

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,6 @@ struct snd_soc_pcm_runtime { 
	struct delayed_work delayed_work;

#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_dpcm_root;

	struct dentry *debugfs_dpcm_state;

#endif



	unsigned int num; /* 0-based and monotonic increasing */

sound/soc/soc-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -3010,8 +3010,7 @@ void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) 
		return;

	}



	rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444,

						rtd->debugfs_dpcm_root,

	debugfs_create_file("state", 0444, rtd->debugfs_dpcm_root,

			    rtd, &dpcm_state_fops);

}

#endif