From patchwork Fri Apr 1 14:04:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iiro Valkonen X-Patchwork-Id: 681241 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 p31E5AUO017931 for ; Fri, 1 Apr 2011 14:05:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756860Ab1DAOEz (ORCPT ); Fri, 1 Apr 2011 10:04:55 -0400 Received: from newsmtp5.atmel.com ([204.2.163.5]:53218 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756620Ab1DAOEx (ORCPT ); Fri, 1 Apr 2011 10:04:53 -0400 Received: from csomb01.corp.atmel.com ([10.95.30.150]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p31E22bl005629; Fri, 1 Apr 2011 07:02:02 -0700 (PDT) Received: from hammb01.corp.atmel.com ([10.142.130.20]) by csomb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 1 Apr 2011 08:04:49 -0600 Received: from [10.191.100.69] ([10.191.100.69]) by hammb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 1 Apr 2011 15:04:43 +0100 Message-ID: <4D95DB70.2090604@atmel.com> Date: Fri, 01 Apr 2011 17:04:32 +0300 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: Joonyoung Shim , linux-input@vger.kernel.org Subject: [PATCH 2/2 v2] Input: atmel_mxt_ts - Make CHG line high after the interrupts are enabled References: <4D821E00.5060104@atmel.com> In-Reply-To: X-OriginalArrivalTime: 01 Apr 2011 14:04:43.0459 (UTC) FILETIME=[C0145930:01CBF075] 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]); Fri, 01 Apr 2011 14:05:11 +0000 (UTC) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 4012436..08ea846 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 */ @@ -832,6 +828,10 @@ static int mxt_initialize(struct mxt_data *data) return error; info->matrix_ysize = val; + error = mxt_make_highchg(data); + if (error) + return error; + dev_info(&client->dev, "Family ID: %d Variant ID: %d Version: %d Build: %d\n", info->family_id, info->variant_id, info->version, @@ -1098,8 +1098,14 @@ static int __devinit mxt_probe(struct i2c_client *client, if (error) goto err_unregister_device; + error = mxt_make_highchg(data); + if (error) + goto err_remove_sysfs_group; + return 0; +err_remove_sysfs_group: + sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); err_unregister_device: input_unregister_device(input_dev); input_dev = NULL;