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

Commit 219b22b2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 2190521e 7c2dfee8

sound/soc/soc-dapm.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ int snd_soc_dapm_sys_add(struct device *dev) 
		return ret;



	asoc_debugfs = debugfs_create_dir("asoc", NULL);

	if (!IS_ERR(asoc_debugfs))

	if (!IS_ERR(asoc_debugfs) && asoc_debugfs)

		debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs,

				   &pop_time);

	else