From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2798062-1516323048-2-13976923210603675585 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, FREEMAIL_FORGED_FROMDOMAIN 0.25, FREEMAIL_FROM 0.001, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516323047; b=ewRxyhnwBirGPUH7UdfOmU5JPmOwSIEvH8Q5jJYw8BQ0nXZ oKbQY/71bPQj2r4AVDRQdptZxbRDTTd6gTCyMSH8wAHeU9Wv3lOZFsaupf1W99N5 6GDqhSGg+9nN591NJ+jv/sTAgrI+iGKQ1mH/iUSO5sicn+v3Y+jHO7wbLCT5IYvd hTqKvDTcbmxyvPfg5Y60Jlpd35xZXp14ivpER/9Jsm2IOwAtXrzOUnIy8Zy6juZn gFaIaXN8vJu3ThJHlwosNCbHBd1NwBF66sFQ4oYotczn+JiOQRYt53fe5vuX73sL 92XHecVsXLkvDpNl4jtSCRDU/mE2uucvdXv7QBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516323047; bh=cmaNJNG7JoF9Mxet2I/vzuVUVU+sywxe141kTxYBdTw=; b=Uai0eZ9RQ3hf PIMQS1DMT+BbujwO3y5UmYH0EYxGawbMRmsJ8lmM3Zq0d1o9B1flnVHnTcn4lpkA 1jq7lBy5CLaF5UGdhMWH3QmhJBETpDy4J1vJvqFkE0OOAZNNetvYsD8ef6oSbDIQ VzmUE1tlzreDopAmgQrm5u1EYYEL8kfgPpqd7VqnZ6UvhBG9D8qPn3KsEGDe+mPT iUjR3/+Bu6Ic6+IavrHhczIiZvINOM91bpf1+EAZeCVsS2/pp76MEychhlOsOQeg XrGzxPpcS9m5q2GGJZEH7YzDoiLts/ot5dYBuseoK6b8i4GB8shyNLgBBvq+iARh k2Ft3tun5Q== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=WBYGVgtJ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=pass (p=none,has-list-id=yes,d=none) header.from=gmail.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=sNc9IAIj; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=gmail.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=WBYGVgtJ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=pass (p=none,has-list-id=yes,d=none) header.from=gmail.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=sNc9IAIj; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=gmail.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755373AbeASAum (ORCPT ); Thu, 18 Jan 2018 19:50:42 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36347 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754796AbeASAuA (ORCPT ); Thu, 18 Jan 2018 19:50:00 -0500 X-Google-Smtp-Source: ACJfBosrUFT0ogaiwvig1We9yEAlJ45hYRJyoZd9BV0F64KbQaZ4D234fq5ioew552qhbRHLywakFA== From: Dmitry Torokhov To: Benjamin Tissoires , Lyude Paul , Damjan Georgievski Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Duggan , stable@vger.kernel.org Subject: [PATCH 1/3] Input: synaptics_rmi4 - do not delete interrupt memory too early Date: Thu, 18 Jan 2018 16:49:53 -0800 Message-Id: <20180119004955.247190-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <20180119004955.247190-1-dmitry.torokhov@gmail.com> References: <20180119004955.247190-1-dmitry.torokhov@gmail.com> Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: We want to free memory reserved for interrupt mask handling only after we free functions, as function drivers might want to mask interrupts. This is needed for the followup patch to the F03 that would implement unmasking and masking interrupts from the serio pass-through port open() and close() methods. Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov --- drivers/input/rmi4/rmi_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 27791d6546c66..ce3ede289ed04 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -41,6 +41,13 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, "Freeing function list\n"); + /* Doing it in the reverse order so F01 will be removed last */ + list_for_each_entry_safe_reverse(fn, tmp, + &data->function_list, node) { + list_del(&fn->node); + rmi_unregister_function(fn); + } + devm_kfree(&rmi_dev->dev, data->irq_memory); data->irq_memory = NULL; data->irq_status = NULL; @@ -50,13 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) data->f01_container = NULL; data->f34_container = NULL; - - /* Doing it in the reverse order so F01 will be removed last */ - list_for_each_entry_safe_reverse(fn, tmp, - &data->function_list, node) { - list_del(&fn->node); - rmi_unregister_function(fn); - } } static int reset_one_function(struct rmi_function *fn) -- 2.16.0.rc1.238.g530d649a79-goog