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 E0B1422F772; Mon, 2 Jun 2025 15:04:10 +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=1748876651; cv=none; b=Ip8ZApPGNzy0uynJFQfBD4NV8DoyUSQHs50uB+Xvn06GfIhIzgQKSsEf36zeUpO3Dxe0L0yzLAo1WeLqZGN0wWH6C54e7sHGjvoJlpb8l+UX/JLsKB+e4d8BBoOAy/OGIG7/KSsauf49Wxc7uS9QWuyHB9j1WBAjJtKuYp1zS54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876651; c=relaxed/simple; bh=Va0FVwksD7S/ka60kz6g2tjulbWxbRRn07xPQoNNtjw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mNHTViu+eEucT0Z5dwZf0RCMI62/UKGE+n6sQLnBf7Rkc4y2ItvAxQlkkgSQFk6M37+2LevwEnuReIjli10OfWXUAOQdSVKCqKq+yHbbWxrtU5Znnbb964P5VipmatV/1pjbekhFTeDgkgsMD3RTtfvpGKmGgsziYnC8ykUxL9Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lPLHpaY2; 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="lPLHpaY2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EDA7C4CEEB; Mon, 2 Jun 2025 15:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876650; bh=Va0FVwksD7S/ka60kz6g2tjulbWxbRRn07xPQoNNtjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lPLHpaY2sAHCDftlDLMcKCbW5gWAWgMXO4oSjF1atWDqCxTt9BSX199AAky52W5P/ B+g32GHGn22XzwVCIgEw04lph+a6tQtOz8LjojKk/4kqPAutwd3zOjalyOhWHFj6Fb YhGUs6vlNbp5JRxVNUimQ5dYBIoy6HC5Q+BtRcf8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tudor Ambarus , Jassi Brar , Sasha Levin Subject: [PATCH 6.1 030/325] mailbox: use error ret code of of_parse_phandle_with_args() Date: Mon, 2 Jun 2025 15:45:06 +0200 Message-ID: <20250602134320.971412851@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tudor Ambarus [ Upstream commit 24fdd5074b205cfb0ef4cd0751a2d03031455929 ] In case of error, of_parse_phandle_with_args() returns -EINVAL when the passed index is negative, or -ENOENT when the index is for an empty phandle. The mailbox core overwrote the error return code with a less precise -ENODEV. Use the error returned code from of_parse_phandle_with_args(). Signed-off-by: Tudor Ambarus Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/mailbox.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 4229b9b5da98f..6f54501dc7762 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -350,11 +350,12 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index) mutex_lock(&con_mutex); - if (of_parse_phandle_with_args(dev->of_node, "mboxes", - "#mbox-cells", index, &spec)) { + ret = of_parse_phandle_with_args(dev->of_node, "mboxes", "#mbox-cells", + index, &spec); + if (ret) { dev_dbg(dev, "%s: can't parse \"mboxes\" property\n", __func__); mutex_unlock(&con_mutex); - return ERR_PTR(-ENODEV); + return ERR_PTR(ret); } chan = ERR_PTR(-EPROBE_DEFER); -- 2.39.5