summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2008-11-03 12:22:07 -0700
committerTakashi Iwai <tiwai@suse.de>2008-11-04 08:40:55 +0100
commitdce908e26fa0ea7d504d3f294c7411ed1eba5077 (patch)
tree449831776e5616704dc2e001a4931c9fb936669d
parent7b3b6e42032e94a6132a85642e95106f5346650e (diff)
downloadlinux-3.10-dce908e26fa0ea7d504d3f294c7411ed1eba5077.tar.gz
linux-3.10-dce908e26fa0ea7d504d3f294c7411ed1eba5077.tar.bz2
linux-3.10-dce908e26fa0ea7d504d3f294c7411ed1eba5077.zip
ALSA: SOC: Fix setting codec register with debugfs filesystem merge error
Call device_create_file only once in snd_soc_dapm_sys_add function. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7bf3c409459..0fecbb44726 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -822,14 +822,8 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
int snd_soc_dapm_sys_add(struct device *dev)
{
- int ret;
-
if (!dapm_status)
return 0;
-
- ret = device_create_file(dev, &dev_attr_dapm_widget);
- if (ret != 0)
- return ret;
return device_create_file(dev, &dev_attr_dapm_widget);
}