Commit e3e1cfe3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-10-24' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241024124921.GA20475@localhost.localdomain
parents 2ba1f81e 5c238782

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

+2 −1
Original line number Diff line number Diff line
@@ -58,9 +58,10 @@ int drm_aux_bridge_register(struct device *parent) 
	adev->id = ret;

	adev->name = "aux_bridge";

	adev->dev.parent = parent;

	adev->dev.of_node = of_node_get(parent->of_node);

	adev->dev.release = drm_aux_bridge_release;



	device_set_of_node_from_dev(&adev->dev, parent);



	ret = auxiliary_device_init(adev);

	if (ret) {

		ida_free(&drm_aux_bridge_ida, adev->id);

drivers/gpu/drm/bridge/tc358767.c

+1 −0
Original line number Diff line number Diff line
@@ -2391,6 +2391,7 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc) 
			if (tc->pre_emphasis[0] < 0 || tc->pre_emphasis[0] > 2 ||

			    tc->pre_emphasis[1] < 0 || tc->pre_emphasis[1] > 2) {

				dev_err(dev, "Incorrect Pre-Emphasis setting, use either 0=0dB 1=3.5dB 2=6dB\n");

				of_node_put(node);

				return -EINVAL;

			}

		}