Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp4146182pxb; Mon, 21 Feb 2022 13:15:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKXPDWaVE3DEZnjNejOQmoZyAtdFKeMIVa5JTgWCvxNjY8dUI4WH1ovpkqqoE2peHYZVx0 X-Received: by 2002:aa7:9688:0:b0:4e1:aee6:45a3 with SMTP id f8-20020aa79688000000b004e1aee645a3mr21655588pfk.12.1645478151000; Mon, 21 Feb 2022 13:15:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645478150; cv=none; d=google.com; s=arc-20160816; b=ExDtYWqZRj9/5Rh2DjRUbiSoQ2RB+juLIfMKOnyRKPjrYpBW73sOdBTILb3zR++sis W/b1rb6R7RW0pvAffTSGRwhf6XTWFl7e0oyna2bYuX0hhkw7TXHEXVvgByfu/3DaW9w4 GipNEebAaleX/9yDi7bBJixwwxlT0BPwT4fBA0U9Pg+kFtxY2rm07P39cblzmcAjs2qw WrdRTF7r1LoTyZeCFm9nCEzZsAdC7IchOLmED9kpXUKHWpDnYlGbDQdFtC82bsEo7u38 S1RCsuqghVXm7jOxY3BRD+XOmMgUgxpT9yxgflau1foC/7Qy4TVG748QsMWB66WrVL59 Lv0w== 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=HHdDp8mJAr/ngh1J2vHDFORmxoRkxUxmcxg73b0EOQg=; b=rmYLHeD1A73dvwL29LH85wtIsAq84dpjc2WBhxKB+X5QfLI7TNJFFvPY1PqelGrYoG VNmmDWBUHh++2SARbbheAH7HA8e8YrrTKwwBSBjSEXOILIhKWMMfCy6p15Dh7Tba9EXY lYCyvN9xB33ZM7XmhvtQ54XqXJXrsjqcqwuD03F2P+iF0CRmP2SMn+FFEXcmSbyvG5p1 Bg3KA4EAvInBhrov4eD+PAS2Gd5DUWZu3eS1kfhpgyKumglK5nUzcuviaQv24vOPYcaP rMkHwXfnR24J5bsm6QJoox5FNwLqyX48qTOKLSFfc5RN7MyueoF70nRHq2nw5IisLgDn Qn3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qaBowNK4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r8si9107940pff.43.2022.02.21.13.15.34; Mon, 21 Feb 2022 13:15:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qaBowNK4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347283AbiBUJFH (ORCPT + 99 others); Mon, 21 Feb 2022 04:05:07 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:32958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347485AbiBUJB0 (ORCPT ); Mon, 21 Feb 2022 04:01:26 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD66360C0; Mon, 21 Feb 2022 00:56:35 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2F466B80EAF; Mon, 21 Feb 2022 08:56:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 556B6C340F1; Mon, 21 Feb 2022 08:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433791; bh=kFWU/qVNY7RS+nn/qS0y7zGIjLNV/ntVRPEsieqg5lc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qaBowNK4VPbo99PawXR3WkkRaHyu+zU/sWMr/gsGhDfPveb5GsBBAE1zIyL3cHMx3 bBAcbdKlcNYB1t+IdtDMEgJv8+z0A1x5AaLCpeltYl1G245Z1XcIyepMXM41ugsg6N umBdXUo/u0xR4qUgqXAamYOwAYeH5PWk2n2f3Kvc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiasheng Jiang , Geert Uytterhoeven , Vinod Koul Subject: [PATCH 4.19 43/58] dmaengine: sh: rcar-dmac: Check for error num after setting mask Date: Mon, 21 Feb 2022 09:49:36 +0100 Message-Id: <20220221084913.271805148@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084911.895146879@linuxfoundation.org> References: <20220221084911.895146879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiasheng Jiang commit 2d21543efe332cd8c8f212fb7d365bc8b0690bfa upstream. Because of the possible failure of the dma_supported(), the dma_set_mask_and_coherent() may return error num. Therefore, it should be better to check it and return the error if fails. Fixes: dc312349e875 ("dmaengine: rcar-dmac: Widen DMA mask to 40 bits") Signed-off-by: Jiasheng Jiang Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20220106030939.2644320-1-jiasheng@iscas.ac.cn Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/sh/rcar-dmac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1817,7 +1817,9 @@ static int rcar_dmac_probe(struct platfo platform_set_drvdata(pdev, dmac); dmac->dev->dma_parms = &dmac->parms; dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); - dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40)); + ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40)); + if (ret) + return ret; ret = rcar_dmac_parse_of(&pdev->dev, dmac); if (ret < 0)