linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: Let the FT5x06 driver build without debugfs
@ 2012-08-17  0:15 Eric W. Biederman
  2012-08-17  8:09 ` Simon Budig
  0 siblings, 1 reply; 7+ messages in thread
From: Eric W. Biederman @ 2012-08-17  0:15 UTC (permalink / raw)
  To: Simon Budig; +Cc: Henrik Rydberg, Dmitry Torokhov, linux-kernel, linux-input


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" <ebiederm@xmission.com>
---
 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


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-17  0:15 [PATCH] Input: Let the FT5x06 driver build without debugfs Eric W. Biederman
@ 2012-08-17  8:09 ` Simon Budig
  2012-08-17 19:21   ` Eric W. Biederman
  0 siblings, 1 reply; 7+ messages in thread
From: Simon Budig @ 2012-08-17  8:09 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Henrik Rydberg, Dmitry Torokhov, linux-kernel, linux-input

-----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/linux-input@vger.kernel.org/msg00646.html

Thanks,
        Simon


- -- 
       Simon Budig                        kernel concepts GmbH
       simon.budig@kernelconcepts.de      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-----

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-17  8:09 ` Simon Budig
@ 2012-08-17 19:21   ` Eric W. Biederman
  2012-08-20 13:53     ` Guenter Roeck
  0 siblings, 1 reply; 7+ messages in thread
From: Eric W. Biederman @ 2012-08-17 19:21 UTC (permalink / raw)
  To: Simon Budig; +Cc: Henrik Rydberg, Dmitry Torokhov, linux-kernel, linux-input

Simon Budig <simon.budig@kernelconcepts.de> 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/linux-input@vger.kernel.org/msg00646.html

If you guys could get that merged into 3.6 I would appreciate it.

Thanks,
Eric

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-17 19:21   ` Eric W. Biederman
@ 2012-08-20 13:53     ` Guenter Roeck
  2012-08-22  5:49       ` Dmitry Torokhov
  0 siblings, 1 reply; 7+ messages in thread
From: Guenter Roeck @ 2012-08-20 13:53 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Simon Budig, Henrik Rydberg, Dmitry Torokhov, linux-kernel, linux-input

On Fri, Aug 17, 2012 at 12:21:34PM -0700, Eric W. Biederman wrote:
> Simon Budig <simon.budig@kernelconcepts.de> 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/linux-input@vger.kernel.org/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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-20 13:53     ` Guenter Roeck
@ 2012-08-22  5:49       ` Dmitry Torokhov
  2012-08-30 22:26         ` David Rientjes
  0 siblings, 1 reply; 7+ messages in thread
From: Dmitry Torokhov @ 2012-08-22  5:49 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Eric W. Biederman, Simon Budig, Henrik Rydberg, linux-kernel,
	linux-input

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 <simon.budig@kernelconcepts.de> 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/linux-input@vger.kernel.org/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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-22  5:49       ` Dmitry Torokhov
@ 2012-08-30 22:26         ` David Rientjes
  2012-08-30 22:55           ` Dmitry Torokhov
  0 siblings, 1 reply; 7+ messages in thread
From: David Rientjes @ 2012-08-30 22:26 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Guenter Roeck, Eric W. Biederman, Simon Budig, Henrik Rydberg,
	linux-kernel, linux-input

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/linux-input@vger.kernel.org/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)?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Input: Let the FT5x06 driver build without debugfs
  2012-08-30 22:26         ` David Rientjes
@ 2012-08-30 22:55           ` Dmitry Torokhov
  0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Torokhov @ 2012-08-30 22:55 UTC (permalink / raw)
  To: David Rientjes
  Cc: Guenter Roeck, Eric W. Biederman, Simon Budig, Henrik Rydberg,
	linux-kernel, linux-input

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/linux-input@vger.kernel.org/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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2012-08-30 22:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-17  0:15 [PATCH] Input: Let the FT5x06 driver build without debugfs Eric W. Biederman
2012-08-17  8:09 ` Simon Budig
2012-08-17 19:21   ` Eric W. Biederman
2012-08-20 13:53     ` Guenter Roeck
2012-08-22  5:49       ` Dmitry Torokhov
2012-08-30 22:26         ` David Rientjes
2012-08-30 22:55           ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).