When testing to make certain my user namespace code works
in various configurations I tripped over the tf5x06.c not
building with debugfs disabled.
drivers/input/touchscreen/edt-ft5x06.c: In function ‘edt_ft5x06_ts_remove’:
drivers/input/touchscreen/edt-ft5x06.c:846:14: error: ‘struct edt_ft5x06_ts_data’ has no member named ‘raw_buffer’
Fix the build by placing an #ifdef around the problem kfree.
Signed-off-by: "Eric W. Biederman" <[email protected]>
---
drivers/input/touchscreen/edt-ft5x06.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 9afc777..bc160b3 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -843,7 +843,9 @@ static int __devexit edt_ft5x06_ts_remove(struct i2c_client *client)
if (gpio_is_valid(pdata->reset_pin))
gpio_free(pdata->reset_pin);
+#if defined(CONFIG_DEBUG_FS)
kfree(tsdata->raw_buffer);
+#endif
kfree(tsdata);
return 0;
--
1.7.5.4
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
> When testing to make certain my user namespace code works in
> various configurations I tripped over the tf5x06.c not building
> with debugfs disabled.
Sorry for that.
There already is a patch for this issue which I slightly prefer. You
can find it in the mail from Guenther Roeck:
http://www.mail-archive.com/[email protected]/msg00646.html
Thanks,
Simon
- --
Simon Budig kernel concepts GmbH
[email protected] Sieghuetter Hauptweg 48
+49-271-771091-17 D-57072 Siegen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAlAt/B0ACgkQO2O/RXesiHCszgCeID9FyWmWea9eyktU38ikzPQP
V2gAoLfff/V9CtE9xpVmS2wIyyrC2d0J
=SSUc
-----END PGP SIGNATURE-----
Simon Budig <[email protected]> writes:
> On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
>> When testing to make certain my user namespace code works in
>> various configurations I tripped over the tf5x06.c not building
>> with debugfs disabled.
>
> Sorry for that.
>
> There already is a patch for this issue which I slightly prefer. You
> can find it in the mail from Guenther Roeck:
> http://www.mail-archive.com/[email protected]/msg00646.html
If you guys could get that merged into 3.6 I would appreciate it.
Thanks,
Eric
On Fri, Aug 17, 2012 at 12:21:34PM -0700, Eric W. Biederman wrote:
> Simon Budig <[email protected]> writes:
>
> > On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
> >> When testing to make certain my user namespace code works in
> >> various configurations I tripped over the tf5x06.c not building
> >> with debugfs disabled.
> >
> > Sorry for that.
> >
> > There already is a patch for this issue which I slightly prefer. You
> > can find it in the mail from Guenther Roeck:
> > http://www.mail-archive.com/[email protected]/msg00646.html
>
> If you guys could get that merged into 3.6 I would appreciate it.
>
Yes, that would be great. I don't recall seeing an e-mail from Dmitry accepting
it, though.
Guenter
On Mon, Aug 20, 2012 at 06:53:03AM -0700, Guenter Roeck wrote:
> On Fri, Aug 17, 2012 at 12:21:34PM -0700, Eric W. Biederman wrote:
> > Simon Budig <[email protected]> writes:
> >
> > > On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
> > >> When testing to make certain my user namespace code works in
> > >> various configurations I tripped over the tf5x06.c not building
> > >> with debugfs disabled.
> > >
> > > Sorry for that.
> > >
> > > There already is a patch for this issue which I slightly prefer. You
> > > can find it in the mail from Guenther Roeck:
> > > http://www.mail-archive.com/[email protected]/msg00646.html
> >
> > If you guys could get that merged into 3.6 I would appreciate it.
> >
> Yes, that would be great. I don't recall seeing an e-mail from Dmitry accepting
> it, though.
Applied, sorry for the delay.
--
Dmitry
On Tue, 21 Aug 2012, Dmitry Torokhov wrote:
> > > > On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
> > > >> When testing to make certain my user namespace code works in
> > > >> various configurations I tripped over the tf5x06.c not building
> > > >> with debugfs disabled.
> > > >
> > > > Sorry for that.
> > > >
> > > > There already is a patch for this issue which I slightly prefer. You
> > > > can find it in the mail from Guenther Roeck:
> > > > http://www.mail-archive.com/[email protected]/msg00646.html
> > >
> > > If you guys could get that merged into 3.6 I would appreciate it.
> > >
> > Yes, that would be great. I don't recall seeing an e-mail from Dmitry accepting
> > it, though.
>
> Applied, sorry for the delay.
>
This still affects Linus' tree and causes a build breakage without debugfs
configured. Considering the driver went into 3.5-rc5, could you please
push this fix for 3.6 (and mark it for stable backport)?
On Thu, Aug 30, 2012 at 03:26:21PM -0700, David Rientjes wrote:
> On Tue, 21 Aug 2012, Dmitry Torokhov wrote:
>
> > > > > On 08/17/2012 02:15 AM, Eric W. Biederman wrote:
> > > > >> When testing to make certain my user namespace code works in
> > > > >> various configurations I tripped over the tf5x06.c not building
> > > > >> with debugfs disabled.
> > > > >
> > > > > Sorry for that.
> > > > >
> > > > > There already is a patch for this issue which I slightly prefer. You
> > > > > can find it in the mail from Guenther Roeck:
> > > > > http://www.mail-archive.com/[email protected]/msg00646.html
> > > >
> > > > If you guys could get that merged into 3.6 I would appreciate it.
> > > >
> > > Yes, that would be great. I don't recall seeing an e-mail from Dmitry accepting
> > > it, though.
> >
> > Applied, sorry for the delay.
> >
>
> This still affects Linus' tree and causes a build breakage without debugfs
> configured. Considering the driver went into 3.5-rc5, could you please
> push this fix for 3.6
I Just sent a pull request to Linus.
> (and mark it for stable backport)?
I am pretty sure it was merged in 3.6 merge window, not 3.5, so no need
to mark for stable.
Thanks.
--
Dmitry