From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 1507E47277D; Sat, 12 Sep 2026 16:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229015; cv=none; b=B5yh8j6JJCzE7MXJDU8QXT/GnHPPhgK9si6u8SS65/Es9tTiCQSceHf9fEUk/ysHnvJbG7IBrGkfhvjdYBQAaqJk5N2QkBkNloikKXXkbH0JSucLxNuupVA9kp46CV7Xshfr+XgtyGNJH24wabUJsNvEvhPNqwMRNtvj+Z4Pseg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229015; c=relaxed/simple; bh=e/QUrAh9seK1w3VQkbyP3ITb1p56zDJQI8FMBgaUluU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G33bu3D9J/A1nqQrrOY4UGs6mLKYvjrfUiKe5CWjZSGLiAfpx7Jkqu4e+Y6HiiMyBMtwhAI550/UBIrH359G0TVXgryVMsjBehpd60pWzWVOhJff8N7SeCTtnklM2+/bqfUhN2SEi44oH2WG++XSy+LH620ctqalyQCLxNH/qfA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Bmf9Hu12; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Bmf9Hu12" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 492701F000FF; Sat, 12 Sep 2026 16:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789229012; bh=BtDuote4ez65875OtkiwsknBr77QhaWy2JSX+HInFZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Bmf9Hu12+TS/uMcf4aHvTVwHCS4Dn5EhyZd5RqK/XDUM4QmVg6A5RDJOuGi0Ax/Xu Wm2ndpQFuLoWTypPcegZS/q56iFLRbNTntP48udYIbrvc325qbfTRjPe9EL34wdQak lkWAQjxc9kMsrVjZkVjUsKRQPoYyU/PazMn1x1bc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Zimmermann , Luca Ceresoli , Maxime Ripard , Sasha Levin Subject: [PATCH 6.1 0466/1191] drm/bridge: cdns-mhdp8546: Return an error pointer on allocation failure Date: Sat, 12 Sep 2026 08:53:14 +0200 Message-ID: <20260912065558.701193270@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 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: Maxime Ripard [ Upstream commit 30ac1d403438a6c6039f0af5bb2df3d021f96036 ] The drm_bridge_funcs.atomic_reset documentation states that the hook must return either a valid drm_bridge_state object or an ERR_PTR(). The cdns_mhdp_bridge_atomic_reset() callback returns NULL when the allocation of its state fails, violating this contract. Return ERR_PTR(-ENOMEM) instead. Fixes: fb43aa0acdfd ("drm: bridge: Add support for Cadence MHDP8546 DPI/DP bridge") Reviewed-by: Thomas Zimmermann Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli # imx8mp + sn65dsi84 + bridge hotplug Link: https://patch.msgid.link/20260619-drm-no-more-bridge-reset-v3-2-ff399263111b@kernel.org Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index aaa9f44d27be5..e363189793b49 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -2145,7 +2145,7 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge) cdns_mhdp_state = kzalloc(sizeof(*cdns_mhdp_state), GFP_KERNEL); if (!cdns_mhdp_state) - return NULL; + return ERR_PTR(-ENOMEM); __drm_atomic_helper_bridge_reset(bridge, &cdns_mhdp_state->base); -- 2.53.0