diff options
| author | Troy Kisky | 2008-11-03 20:22:07 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2008-11-04 08:40:55 +0100 |
| commit | dce908e26fa0ea7d504d3f294c7411ed1eba5077 (patch) | |
| tree | 449831776e5616704dc2e001a4931c9fb936669d /sound | |
| parent | Merge commit 'v2.6.28-rc2' into topic/asoc (diff) | |
| download | kernel-qcow2-linux-dce908e26fa0ea7d504d3f294c7411ed1eba5077.tar.gz kernel-qcow2-linux-dce908e26fa0ea7d504d3f294c7411ed1eba5077.tar.xz kernel-qcow2-linux-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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7bf3c4094592..0fecbb44726b 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); } |