From: Takashi Iwai <tiwai@suse•de>
To: Troy Kisky <troy.kisky@boundarydevices•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, linux-next@vger•kernel.org
Subject: Re: linux-next: sound tree build failure
Date: Sat, 01 Nov 2008 10:53:30 +0100 [thread overview]
Message-ID: <s5h63n7wz51.wl%tiwai@suse.de> (raw)
In-Reply-To: <490B6F68.8090806@boundarydevices.com>
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
next prev parent reply other threads:[~2008-11-01 9:53 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-31 3:41 linux-next: sound tree build failure Stephen Rothwell
2008-10-31 6:39 ` Takashi Iwai
2008-10-31 20:49 ` Troy Kisky
2008-11-01 9:53 ` Takashi Iwai [this message]
2008-11-03 19:22 ` [PATCH 1/1] [ALSA] SOC: Fix setting codec register with debugfs filesystem merge error Troy Kisky
2008-11-03 19:58 ` Mark Brown
2008-11-04 7:46 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2008-11-14 3:56 linux-next: sound tree build failure Stephen Rothwell
2008-11-14 6:32 ` Takashi Iwai
2008-11-14 6:58 ` Stephen Rothwell
2008-11-14 7:07 ` Takashi Iwai
2008-11-14 7:14 ` Takashi Iwai
2008-11-14 7:27 ` Stephen Rothwell
2008-11-14 7:41 ` Takashi Iwai
2008-11-14 7:46 ` Stephen Rothwell
2008-12-10 5:23 Stephen Rothwell
2008-12-10 6:53 ` Takashi Iwai
2008-12-10 11:47 ` Mark Brown
2008-12-15 4:43 Stephen Rothwell
2008-12-15 7:36 ` Takashi Iwai
2008-12-16 20:59 ` Ingo Molnar
2008-12-17 7:38 ` Takashi Iwai
2009-02-03 3:10 Stephen Rothwell
2009-02-03 5:51 ` Takashi Iwai
2009-02-03 14:48 ` Timur Tabi
2009-02-26 3:07 Stephen Rothwell
2009-02-26 8:46 ` Takashi Iwai
2009-02-26 10:25 ` Mark Brown
2009-02-26 10:31 ` Takashi Iwai
2009-03-16 10:39 Stephen Rothwell
2009-03-16 10:41 ` Takashi Iwai
2009-03-16 23:02 ` Stephen Rothwell
2009-03-16 10:59 ` Mark Brown
2009-03-16 23:03 ` Stephen Rothwell
2009-05-20 14:31 Stephen Rothwell
2009-05-20 14:46 ` Takashi Iwai
2009-05-20 14:59 ` Stephen Rothwell
2009-05-20 15:15 ` Takashi Iwai
2009-06-04 7:33 Stephen Rothwell
2009-06-04 8:03 ` Takashi Iwai
2009-06-04 8:08 ` Peter Ujfalusi
2009-06-04 8:54 ` Mark Brown
2009-07-17 1:29 Stephen Rothwell
2009-07-17 4:56 ` Greg KH
2009-07-17 5:32 ` Stephen Rothwell
2009-07-17 16:27 ` Greg KH
2009-07-17 9:27 ` Takashi Iwai
2009-07-17 9:28 ` Mark Brown
2009-07-17 9:31 ` Takashi Iwai
2009-08-28 1:23 Stephen Rothwell
2009-08-28 5:37 ` Takashi Iwai
2009-08-28 5:47 ` Stephen Rothwell
2009-10-01 1:19 Stephen Rothwell
2009-10-01 6:45 ` Takashi Iwai
2009-10-01 10:31 ` Stephen Rothwell
2009-10-02 1:15 Stephen Rothwell
2009-10-02 5:57 ` Takashi Iwai
2009-10-12 5:08 Stephen Rothwell
2009-10-12 5:34 ` Takashi Iwai
2010-02-02 1:47 Stephen Rothwell
2010-02-02 7:27 ` Takashi Iwai
2010-02-02 10:31 ` Mark Brown
2010-02-02 10:40 ` Takashi Iwai
2010-02-02 10:42 ` Mark Brown
2010-02-02 10:26 ` Mark Brown
2010-02-02 10:37 ` Stephen Rothwell
2010-02-02 10:58 ` Mark Brown
2010-02-02 11:17 ` Stephen Rothwell
2010-02-02 11:34 ` Mark Brown
2010-02-02 11:55 ` Stephen Rothwell
2010-02-02 12:03 ` Mark Brown
2010-02-02 11:50 ` Liam Girdwood
2010-02-02 12:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h63n7wz51.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=troy.kisky@boundarydevices$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox