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.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,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 C93F3C2BA2B for ; Sat, 11 Apr 2020 12:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A22A9214D8 for ; Sat, 11 Apr 2020 12:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607355; bh=fGQ3NIWRcW6xTVFkaMNy4C8P5PvXObkGaNqnFg7hcjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FGXufzTNop2x+uq6HJG2hxyJUEVfhFtKJpiAzy81rP6paSqMrcza05tvIXb79h3pu LMy1aWFcbLPqf20pnj5rJ2Jpqyb7P5uZfHG6zWWtsg1ldv7dmCh6A2lgkFDU4T9hG1 fxXq+mGZfIRu1jCvkIlVOvgQh1lClrLu534qjiwI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728214AbgDKMPx (ORCPT ); Sat, 11 Apr 2020 08:15:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:49958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728202AbgDKMPv (ORCPT ); Sat, 11 Apr 2020 08:15:51 -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 41E1C21744; Sat, 11 Apr 2020 12:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607351; bh=fGQ3NIWRcW6xTVFkaMNy4C8P5PvXObkGaNqnFg7hcjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A2XfWeKXAQIaX7E1SWhvBxbvBawWwcDoQPwJWMJR1JxzefKVEq2ar5D3iOvUvcJo9 y+y6sZ+v6K7KPGgmWgo1xA5oECWxPckD+koW1D7x5ldViKnJN4iO15ST8knBAZ7Zu3 uTUVmHTRlpqo5GNJjtydY3E5zbMcjJmMegZgXxR8= 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.19 38/54] hwrng: imx-rngc - fix an error path Date: Sat, 11 Apr 2020 14:09:20 +0200 Message-Id: <20200411115512.341196553@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411115508.284500414@linuxfoundation.org> References: <20200411115508.284500414@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -111,8 +111,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; }