]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: SOC: Fix setting codec register with debugfs filesystem merge error
authorTroy Kisky <troy.kisky@boundarydevices.com>
Mon, 3 Nov 2008 19:22:07 +0000 (12:22 -0700)
committerTakashi Iwai <tiwai@suse.de>
Tue, 4 Nov 2008 07:40:55 +0000 (08:40 +0100)
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>
sound/soc/soc-dapm.c

index 7bf3c4094592c8fb2a3eefa9896010d740e041df..0fecbb44726b9d7fb19e2ca550461f4589fa242c 100644 (file)
@@ -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);
 }