From patchwork Fri Jun 13 21:21:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrik De Bie X-Patchwork-Id: 4351741 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5B1E7BEEAA for ; Fri, 13 Jun 2014 21:21:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9DF6B2026D for ; Fri, 13 Jun 2014 21:21:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D44DD2026F for ; Fri, 13 Jun 2014 21:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753809AbaFMVVp (ORCPT ); Fri, 13 Jun 2014 17:21:45 -0400 Received: from e2big.org ([198.61.226.133]:43001 "EHLO e2big.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbaFMVVo (ORCPT ); Fri, 13 Jun 2014 17:21:44 -0400 Received: from 78-23-174-213.access.telenet.be ([78.23.174.213] helo=lantern.debie) by e2big.org with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1WvYut-0001F4-IH; Fri, 13 Jun 2014 23:21:43 +0200 From: Ulrik De Bie To: Dmitry Torokhov Cc: stable@vger.kernel.org, linux-input@vger.kernel.org, Hans de Goede , David Herrmann , ulrik.debie-os@e2big.org Subject: [PATCH v3 2/2] elantech: Call psmouse_reset when elantech probe fails Date: Fri, 13 Jun 2014 23:21:13 +0200 Message-Id: <1402694473-11518-3-git-send-email-ulrik.debie-os@e2big.org> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1402694473-11518-1-git-send-email-ulrik.debie-os@e2big.org> References: <20140613205547.GA5244@lantern> <1402694473-11518-1-git-send-email-ulrik.debie-os@e2big.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ulrik De Bie --- drivers/input/mouse/elantech.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 0eb185b..fa150d9 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1617,6 +1617,7 @@ int elantech_init(struct psmouse *psmouse) sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj, &elantech_attr_group); init_fail: + psmouse_reset(psmouse); kfree(etd); return error; }