From patchwork Fri Aug 17 00:15:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 1335491 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 1F56840210 for ; Fri, 17 Aug 2012 00:15:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383Ab2HQAP0 (ORCPT ); Thu, 16 Aug 2012 20:15:26 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:40813 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531Ab2HQAPZ convert rfc822-to-8bit (ORCPT ); Thu, 16 Aug 2012 20:15:25 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out01.mta.xmission.com with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1T2ADk-0003p6-8k; Thu, 16 Aug 2012 18:15:24 -0600 Received: from [98.207.153.68] (helo=eric-ThinkPad-X220.xmission.com) by in01.mta.xmission.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1T2ADh-0006rD-GE; Thu, 16 Aug 2012 18:15:24 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Simon Budig Cc: Henrik Rydberg , Dmitry Torokhov , , linux-input@vger.kernel.org Date: Thu, 16 Aug 2012 17:15:16 -0700 Message-ID: <87k3wy1ii3.fsf@xmission.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-XM-SPF: eid=; ; ; mid=; ; ; hst=in01.mta.xmission.com; ; ; ip=98.207.153.68; ; ; frm=ebiederm@xmission.com; ; ; spf=neutral X-XM-AID: U2FsdGVkX18VNwK9eJM9cR8D7EIUrnNszqAwxfbuIOY= X-SA-Exim-Connect-IP: 98.207.153.68 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sa01.xmission.com X-Spam-Level: X-Spam-Status: No, score=-4.0 required=8.0 tests=ALL_TRUSTED,BAYES_00, DCC_CHECK_NEGATIVE autolearn=disabled version=3.3.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * -3.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0070] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa01 1397; Body=1 Fuz1=1 Fuz2=1] X-Spam-DCC: XMission; sa01 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Simon Budig X-Spam-Relay-Country: Subject: [PATCH] Input: Let the FT5x06 driver build without debugfs X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Fri, 06 Aug 2010 16:31:04 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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" --- 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;