Skip to content

Commit e3e1cfe

Browse files
committed
Merge tag 'drm-misc-fixes-2024-10-24' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull: bridge: - aux: Fix assignment of OF node - tc358767: Add missing of_node_put() in error path Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 2ba1f81 + 5c23878 commit e3e1cfe

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/gpu/drm/bridge/aux-bridge.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ int drm_aux_bridge_register(struct device *parent)
5858
adev->id = ret;
5959
adev->name = "aux_bridge";
6060
adev->dev.parent = parent;
61-
adev->dev.of_node = of_node_get(parent->of_node);
6261
adev->dev.release = drm_aux_bridge_release;
6362

63+
device_set_of_node_from_dev(&adev->dev, parent);
64+
6465
ret = auxiliary_device_init(adev);
6566
if (ret) {
6667
ida_free(&drm_aux_bridge_ida, adev->id);

drivers/gpu/drm/bridge/tc358767.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2391,6 +2391,7 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)
23912391
if (tc->pre_emphasis[0] < 0 || tc->pre_emphasis[0] > 2 ||
23922392
tc->pre_emphasis[1] < 0 || tc->pre_emphasis[1] > 2) {
23932393
dev_err(dev, "Incorrect Pre-Emphasis setting, use either 0=0dB 1=3.5dB 2=6dB\n");
2394+
of_node_put(node);
23942395
return -EINVAL;
23952396
}
23962397
}

0 commit comments

Comments
 (0)