Subject: Re: linux-next: sound tree build failure

From: Takashi Iwai <[email-masked]>
Date: Sat, 01 Nov 2008 10:53:30 +0100

At Fri, 31 Oct 2008 13:49:44 -0700,
Troy Kisky wrote:
> 
> Stephen Rothwell wrote:
> > Hi Takashi,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > sound/soc/soc-dapm.c: In function 'snd_soc_dapm_sys_add':
> > sound/soc/soc-dapm.c:828: error: 'ret' undeclared (first use in this function)
> > 
> > Caused by commit 12ef193d5817504621e503e78d641265f6a86ac4 ("ASoC: Allow
> > setting codec register with debugfs filesystem") which removed the
> > declaration.
> > 
> > I applied the following patch.  More care required.
> 
> My patch had
> @@ -822,23 +818,9 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
> 
>  int snd_soc_dapm_sys_add(struct device *dev)
>  {
> -	int ret = 0;
> -
>  	if (!dapm_status)
>  		return 0;
> -
> -	ret = device_create_file(dev, &dev_attr_dapm_widget);
> -	if (ret != 0)
> -		return ret;
> -
> -	asoc_debugfs = debugfs_create_dir("asoc", NULL);
> -	if (!IS_ERR(asoc_debugfs))
> -		debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs,
> -				   &pop_time);
> -	else
> -		asoc_debugfs = NULL;
> -
> -	return 0;
> +	return device_create_file(dev, &dev_attr_dapm_widget);
>  }
> 
> 
> 
> which somehow got changed to
> @@ -821,23 +817,13 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
> 
>  int snd_soc_dapm_sys_add(struct device *dev)
>  {
> -	int ret = 0;
> -
>  	if (!dapm_status)
>  		return 0;
> 
>  	ret = device_create_file(dev, &dev_attr_dapm_widget);
>  	if (ret != 0)
>  		return ret;
> -
> -	asoc_debugfs = debugfs_create_dir("asoc", NULL);
> -	if (!IS_ERR(asoc_debugfs) && asoc_debugfs)
> -		debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs,
> -				   &pop_time);
> -	else
> -		asoc_debugfs = NULL;
> -
> -	return 0;
> +	return device_create_file(dev, &dev_attr_dapm_widget);
>  }
> 
> 
> which will call device_create_file twice

Hm, looks like a merge error or so.
Care to create the fix patch against the latest tree?

thanks,

Takashi