From patchwork Sat Apr 11 12:09:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 228092 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 40555C2BBC7 for ; Sat, 11 Apr 2020 12:13:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A7DE20787 for ; Sat, 11 Apr 2020 12:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607227; bh=GiJkc1e1xfErwk3IjOfHmnD535a/btlVEWZipOJPnWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XqyL0pQKvcA1FARKNbJw27uEvDg0sgwm3yaDRzt8WesmpSfDgUXh48E1HWITEjzvV K8b9U0hnMgwMr50aMiPD1/wyvpq6ilnr3cmzVZl8ZCmIDMklRSyRYyO5qR6/FfI0Pw MQL6WfblK6cVQYJofbCFu8wPlOU98xYBDKShAuv4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbgDKMNp (ORCPT ); Sat, 11 Apr 2020 08:13:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:46774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727867AbgDKMNl (ORCPT ); Sat, 11 Apr 2020 08:13:41 -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 8B23C21D7B; Sat, 11 Apr 2020 12:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607221; bh=GiJkc1e1xfErwk3IjOfHmnD535a/btlVEWZipOJPnWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jIx1hLOJZGBgo7jOP6iUJVERr0xrQyWVNS4t2Z/S/jGAwF06IkD8wk/RndCcdhvu2 YvzGDJGidMgYlxfSLwC1HyMiSqekBM9gKj5BwsIvShAZnyd+kderOvHLnIxEpxL/O8 tqxe3BD4HWCvoayZxNA7yGuZLhOXK7FX3u9TkshQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, PrasannaKumar Muralidharan , Martin Kaiser , Herbert Xu Subject: [PATCH 4.14 23/38] hwrng: imx-rngc - fix an error path Date: Sat, 11 Apr 2020 14:09:07 +0200 Message-Id: <20200411115440.319425435@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411115437.795556138@linuxfoundation.org> References: <20200411115437.795556138@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Martin Kaiser commit 47a1f8e8b3637ff5f7806587883d7d94068d9ee8 upstream. Make sure that the rngc interrupt is masked if the rngc self test fails. Self test failure means that probe fails as well. Interrupts should be masked in this case, regardless of the error. Cc: stable@vger.kernel.org Fixes: 1d5449445bd0 ("hwrng: mx-rngc - add a driver for Freescale RNGC") Reviewed-by: PrasannaKumar Muralidharan Signed-off-by: Martin Kaiser Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/char/hw_random/imx-rngc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/char/hw_random/imx-rngc.c +++ b/drivers/char/hw_random/imx-rngc.c @@ -110,8 +110,10 @@ static int imx_rngc_self_test(struct imx return -ETIMEDOUT; } - if (rngc->err_reg != 0) + if (rngc->err_reg != 0) { + imx_rngc_irq_mask_clear(rngc); return -EIO; + } return 0; }