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 649CD1D014A; Wed, 2 Oct 2024 13:25:44 +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=1727875544; cv=none; b=nePeKv+mdPTxewPHpSAxUNQO7QyrRVhhS160yESF+fVIo/xQH/SmUdNQx0S3xIg9QNTBLGcN89Ur2hacO2WXHSbqPlOqc0dPXSrmBukvKzIYATzDZ1zXZdhiFxBRdLWuVwL5lYhmqjUFVdUMhQifFApoSod4D0ZNcusUp75VH3g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875544; c=relaxed/simple; bh=FRKEkPZp8NkN75e1uzX//YFZOLBe+kVKIf/D07SE2nw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qXVfPsBALcaHF02hVtNC1MtQN4b1DqRWp8F3e9roR8EZNRO7pTHaJ/LnUyX0W7wQWzJ7ZNfRsSGM71SG8hBZWpQ45ZfbzNeKaXlj/hkUrSLnxsjECdEt3rapGdBL6uGfhMKdpoOlScltMhIC5pzguMH1OjOz5MnBonI1m8usbqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0jppCjiA; 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="0jppCjiA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCE1DC4CEC5; Wed, 2 Oct 2024 13:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875544; bh=FRKEkPZp8NkN75e1uzX//YFZOLBe+kVKIf/D07SE2nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0jppCjiAkCVBQ0CSCbTwL6AYjJrl9F1NrwCXWzaX4aO34O+vz3rpcPfcmTy6FaHWX ylCCZqKrD6XWNS5cobSyeER7zRbJhhtQFSHsF6rGdvaBRJBJRHmZcQ+GLoLg8AftDo 1eGUloUGqS7dkyFUIJyUK8VOlBx101PXtqqujPZ4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Mark Brown , Sasha Levin Subject: [PATCH 6.11 137/695] spi: ppc4xx: Avoid returning 0 when failed to parse and map IRQ Date: Wed, 2 Oct 2024 14:52:15 +0200 Message-ID: <20241002125827.956224134@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko [ Upstream commit 7781f1d120fec8624fc654eda900fc8748262082 ] 0 is incorrect error code when failed to parse and map IRQ. Replace OF specific old API for IRQ retrieval with a generic one to fix this issue. Fixes: 0f245463b01e ("spi: ppc4xx: handle irq_of_parse_and_map() errors") Signed-off-by: Andy Shevchenko Link: https://patch.msgid.link/20240814144525.2648450-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-ppc4xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 01fdecbf132d6..8f6309f32de0b 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -412,9 +411,10 @@ static int spi_ppc4xx_of_probe(struct platform_device *op) } /* Request IRQ */ - hw->irqnum = irq_of_parse_and_map(np, 0); - if (hw->irqnum <= 0) + ret = platform_get_irq(op, 0); + if (ret < 0) goto free_host; + hw->irqnum = ret; ret = request_irq(hw->irqnum, spi_ppc4xx_int, 0, "spi_ppc4xx_of", (void *)hw); -- 2.43.0