Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp285869pxx; Wed, 28 Oct 2020 05:03:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJuvTGd+L1GMT4twxGUcUZPB7RPgP5laLTeL5oVfzHs5SHMhD0RpH9SWSqx+66hNiPitr2 X-Received: by 2002:a17:906:ad8:: with SMTP id z24mr7003041ejf.222.1603886595297; Wed, 28 Oct 2020 05:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603886595; cv=none; d=google.com; s=arc-20160816; b=gaM2MgUCDZYXeUIHXh/s6ntLCCNyFN59KVWT+dW3RWj1pxQYTg7IlHUdgm5tp6bbOL 9ZHv9JVn7Vz/GBH5Nxh8jWVqBpOpMw1BmENmib+xyJAmJ+7FPZb4ARpNuO57WCYMpuic ODQKd/0UjKG9Vc81B15MrweWdORtI51LRdJxlwOEnYRsj735l9pj2po+IZILUNR0tJI4 wr5iWtI34y/VRbm1i0rY1QXeaEiMudVfYnb11B28WWYqF0aySl5Ax8vby/6YCQZLXe8J ds84MSq5r8/VTl+xyzJ3ESMYUU7MlzRO9ItODtW3YNMqoRfcR7POMj/8CBMkHcQJCBqL VFCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=368YXtPEEF1pBEaVotrOS77bUsdcJHyMWaz/5hImi8k=; b=xiZI2HDxa+ybOoArQjA7pk0r/ia1mQW5nqaY3tbZCDFfCKv4JCbF3U9eIE9YnYbl2Z EvwNNF+iPUGyBQkOvwMHXERqRF9WpqpRcwQMWIYrrQ4VaopOJmZWDAPVr91TH5XYyI4I +fypcbc460Q8LLGIzF4/jvtZaJk6yOws7bYBEku3s6szukRYGHnmcQBonuVHuWaY02On Iy0Fva5QVObWCYfRbF7ot1QmRViDGnXHC9m1TFpeSk/82rbeuCn/AjAPrulojg53pcps 75xBmpsmaCaheWFhlbtjq5N9DG2HDZV3zSmfphRnx4vfsnJKptSrAYTLqCL9IfpfNN+V fgxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QLUhufMR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si3402013edu.343.2020.10.28.05.02.52; Wed, 28 Oct 2020 05:03:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QLUhufMR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1795075AbgJ0PPC (ORCPT + 99 others); Tue, 27 Oct 2020 11:15:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:44998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793972AbgJ0PJc (ORCPT ); Tue, 27 Oct 2020 11:09:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 5FB99206F4; Tue, 27 Oct 2020 15:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811372; bh=t2Od6mWeBioSTjcrzJNg+IRK4kWLCIklU0gs417aVLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLUhufMRJ8ijZqApQz3WzL2wdD4cGNgrh2dTgabe/0qJTk1EY6pj7Hs0CUCVe7H1n vLIk9QErunittEQWcK6xxuEQ8TFUS2xcSbaCENdkUC88/cju/nVJYzRPaVWKuz2PwN h5s3+mKEA3Zve3pKWIEFMceEQ4av4gk5rGk4zwqE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Dmitry Torokhov , Sasha Levin Subject: [PATCH 5.8 469/633] Input: ep93xx_keypad - fix handling of platform_get_irq() error Date: Tue, 27 Oct 2020 14:53:32 +0100 Message-Id: <20201027135544.735013881@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Krzysztof Kozlowski [ Upstream commit 7d50f6656dacf085a00beeedbc48b19a37d17881 ] platform_get_irq() returns -ERRNO on error. In such case comparison to 0 would pass the check. Fixes: 60214f058f44 ("Input: ep93xx_keypad - update driver to new core support") Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20200828145744.3636-1-krzk@kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/keyboard/ep93xx_keypad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index 7c70492d9d6b5..f831f01501d58 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -250,8 +250,8 @@ static int ep93xx_keypad_probe(struct platform_device *pdev) } keypad->irq = platform_get_irq(pdev, 0); - if (!keypad->irq) { - err = -ENXIO; + if (keypad->irq < 0) { + err = keypad->irq; goto failed_free; } -- 2.25.1