From patchwork Thu Mar 17 14:43:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iiro Valkonen X-Patchwork-Id: 641501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2HEj3sj006792 for ; Thu, 17 Mar 2011 14:45:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753709Ab1CQOpC (ORCPT ); Thu, 17 Mar 2011 10:45:02 -0400 Received: from newsmtp5.atmel.com ([204.2.163.5]:59114 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553Ab1CQOpB (ORCPT ); Thu, 17 Mar 2011 10:45:01 -0400 Received: from csomb01.corp.atmel.com ([10.95.30.150]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p2HEgD8p019021; Thu, 17 Mar 2011 07:42:15 -0700 (PDT) Received: from hammb01.corp.atmel.com ([10.142.130.20]) by csomb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 17 Mar 2011 08:43:24 -0600 Received: from [10.191.100.101] ([10.191.100.101]) by hammb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 17 Mar 2011 14:43:23 +0000 Message-ID: <4D821E00.5060104@atmel.com> Date: Thu, 17 Mar 2011 16:43:12 +0200 From: Iiro Valkonen User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8 MIME-Version: 1.0 To: Dmitry Torokhov CC: linux-input@vger.kernel.org Subject: [PATCH 2/2] Input: atmel_mxt_ts - Make CHG line high after the interrupts are enabled X-OriginalArrivalTime: 17 Mar 2011 14:43:23.0199 (UTC) FILETIME=[AA8E54F0:01CBE4B1] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Mar 2011 14:45:03 +0000 (UTC) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index f8cd478..ca2062a 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) if (error) return error; - error = mxt_make_highchg(data); - if (error) - return error; - mxt_handle_pdata(data); /* Backup to memory */ @@ -1098,6 +1094,10 @@ static int __devinit mxt_probe(struct i2c_client *client, if (error) goto err_unregister_device; + error = mxt_make_highchg(data); + if (error) + goto err_unregister_device; + return 0; err_unregister_device: