From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 026E0196DA1 for ; Tue, 30 Jul 2024 10:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722335052; cv=none; b=uJJXPR8hByS8H8N9CLM6MSnG26VwerWSHrZ3NvUlN0KWCL5xl+0wf09AY0o1y+iYa3blUbegiwqnMI87Ed9Pvm5i9O9LxfdNJEWZYX08H+FYRrOnPpPI99rqfoGg9UYHhyXQTZLcaYG17vsacVfWRB9KVI0o3aUJTVtxL7Nv38s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722335052; c=relaxed/simple; bh=mM8oyD9isQfafAXeZybXLtQGgCOMAAj/+VRWHWjHQHk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=HsJdspK1GBmpD4aqOgc5sIGjdcB+XUPyQUsN6LbDQcpf5XTKnRQx5ksNMEySGBEEDNksDRjHmeCX/LHr7OsfYpAuqIonTJX02kgf8jjvcD1ngH+B1IDw2goWKrFVGBesWWS0ADowkyAiiyL6XpaM4cseBtKNe3/tU60xJZlTDuI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MH0D6SqR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MH0D6SqR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 472B9C32782; Tue, 30 Jul 2024 10:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722335051; bh=mM8oyD9isQfafAXeZybXLtQGgCOMAAj/+VRWHWjHQHk=; h=Subject:To:Cc:From:Date:From; b=MH0D6SqRAsJ+CM/+cAJ+qTvRVypUZMe3tVgJbir78ZIPK3ofd3w7UlS4I5hxj4AEe +fn3GNxxWz6zaZlFHleDQX1qiLZtve0eU2SH4YZ5HIp6l5rM+ldUt3F8dYnLdMDimY 7Da63Hq1aZRyWDj/hFX4JNiEM3nJVy3WdGsJ8eAc= Subject: FAILED: patch "[PATCH] mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks" failed to apply to 5.10-stable tree To: piotr.wojtaszczyk@timesys.com,miquel.raynal@bootlin.com Cc: From: Date: Tue, 30 Jul 2024 12:23:59 +0200 Message-ID: <2024073059-maker-presume-f696@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x a503f91a3645651a39baf97f1aed90d5d9f9bda9 # git commit -s git send-email --to '' --in-reply-to '2024073059-maker-presume-f696@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: a503f91a3645 ("mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks") 478211867460 ("mtd: rawnand: lpx32xx: Request DMA channels using DT entries") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a503f91a3645651a39baf97f1aed90d5d9f9bda9 Mon Sep 17 00:00:00 2001 From: Piotr Wojtaszczyk Date: Fri, 5 Jul 2024 13:51:35 +0200 Subject: [PATCH] mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks The dma_request_chan() returns error pointer in case of error, while dma_request_channel() returns NULL in case of error therefore different error checks are needed for the two. Fixes: 7326d3fb1ee3 ("mtd: rawnand: lpx32xx: Request DMA channels using DT entries") Signed-off-by: Piotr Wojtaszczyk Cc: stable@vger.kernel.org Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20240705115139.126522-1-piotr.wojtaszczyk@timesys.com diff --git a/drivers/mtd/nand/raw/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c index 92cebe871bb4..b9c3adc54c01 100644 --- a/drivers/mtd/nand/raw/lpc32xx_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c @@ -575,7 +575,7 @@ static int lpc32xx_dma_setup(struct lpc32xx_nand_host *host) dma_cap_mask_t mask; host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx"); - if (!host->dma_chan) { + if (IS_ERR(host->dma_chan)) { /* fallback to request using platform data */ if (!host->pdata || !host->pdata->dma_filter) { dev_err(mtd->dev.parent, "no DMA platform data\n"); diff --git a/drivers/mtd/nand/raw/lpc32xx_slc.c b/drivers/mtd/nand/raw/lpc32xx_slc.c index 3b7e3d259785..ade971e4cc3b 100644 --- a/drivers/mtd/nand/raw/lpc32xx_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_slc.c @@ -722,7 +722,7 @@ static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host) dma_cap_mask_t mask; host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx"); - if (!host->dma_chan) { + if (IS_ERR(host->dma_chan)) { /* fallback to request using platform data */ if (!host->pdata || !host->pdata->dma_filter) { dev_err(mtd->dev.parent, "no DMA platform data\n");