From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A01FC04E53 for ; Wed, 15 May 2019 12:09:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EFD320657 for ; Wed, 15 May 2019 12:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922191; bh=gOgo5zuTzFuxVDoIpZ2yBFrMkHWUyWlfvHhHOoEM/Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FoLLd717pYEXtfseNe+8q7oW1TmvQh9gxvEDum/5yDpqVImqC3hsRLRe0iy3tJS2v moN+eKUv9LjQWiQTrmy+62w5FZAvsXjkaZM6pTaNVUuLVxekoWlGWREqSDlpv9ZDHI knQgoqUL7ht2N6GUNoxInxz6AEWTqY6Zt0b2ugE0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727087AbfEOLHj (ORCPT ); Wed, 15 May 2019 07:07:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:39478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728928AbfEOLHj (ORCPT ); Wed, 15 May 2019 07:07:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E05620843; Wed, 15 May 2019 11:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918458; bh=gOgo5zuTzFuxVDoIpZ2yBFrMkHWUyWlfvHhHOoEM/Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ddOeUeH00xu35VJ97DIKENPW7Sl89Ouvzw7envRBc+E8p+FBfrAFeqJwzmoUCj7RV FGlw8OCoB+3qE3ZdAUOzJnGKkGjFNKII2QlH60q1KNLAdqqOpe1TZW0PTKLfcqMLNN uNxsH4KQyZXHtAL31k3VdxkRakF7efDINMJ+V0sk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anson Huang , Dmitry Torokhov Subject: [PATCH 4.4 139/266] Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ Date: Wed, 15 May 2019 12:54:06 +0200 Message-Id: <20190515090727.609203008@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anson Huang commit bf2a7ca39fd3ab47ef71c621a7ee69d1813b1f97 upstream. SNVS IRQ is requested before necessary driver data initialized, if there is a pending IRQ during driver probe phase, kernel NULL pointer panic will occur in IRQ handler. To avoid such scenario, just initialize necessary driver data before enabling IRQ. This patch is inspired by NXP's internal kernel tree. Fixes: d3dc6e232215 ("input: keyboard: imx: add snvs power key driver") Signed-off-by: Anson Huang Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/keyboard/snvs_pwrkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/input/keyboard/snvs_pwrkey.c +++ b/drivers/input/keyboard/snvs_pwrkey.c @@ -156,6 +156,9 @@ static int imx_snvs_pwrkey_probe(struct return error; } + pdata->input = input; + platform_set_drvdata(pdev, pdata); + error = devm_request_irq(&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt, 0, pdev->name, pdev); @@ -172,9 +175,6 @@ static int imx_snvs_pwrkey_probe(struct return error; } - pdata->input = input; - platform_set_drvdata(pdev, pdata); - device_init_wakeup(&pdev->dev, pdata->wakeup); return 0;