drm/vc4: hdmi: take i2c adapter module reference
Subsystems (3)
PATCH 1/1 drm/vc4: hdmi: take i2c adapter module reference
The i2c subsystem currently blocks during adapter deregistration whenever there are consumers holding a reference.
Switch to using of_get_i2c_adapter_by_node() which also takes a reference to the adapter module so that an attempt to unload the module while in use fails gracefully instead of blocking uninterruptibly.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +4 -4
@@ -3208,11 +3208,11 @@ static int vc4_hdmi_runtime_resume(struct device *dev)return ret; } -static void vc4_hdmi_put_ddc_device (void *ptr) +static void vc4_hdmi_put_ddc (void *ptr) {struct vc4_hdmi *vc4_hdmi = ptr; -put_device (&vc4_hdmi->ddc->dev); +i2c_put_adapter (vc4_hdmi->ddc); }static int vc4_hdmi_bind (struct device *dev,struct device *master,void *data)
@@ -3266,14 +3266,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)return -ENODEV ; } - vc4_hdmi->ddc =of_find_i2c_adapter_by_node (ddc_node); + vc4_hdmi->ddc =of_get_i2c_adapter_by_node (ddc_node);of_node_put (ddc_node);if (!vc4_hdmi->ddc) {drm_err (drm,"Failed to get ddc i2c adapter by node\n" );return -EPROBE_DEFER ; } - ret =devm_add_action_or_reset (dev, vc4_hdmi_put_ddc_device, vc4_hdmi); + ret =devm_add_action_or_reset (dev, vc4_hdmi_put_ddc, vc4_hdmi);if (ret)return ret;
Signature · 1 line
2.54.0
Quoted 8 lines · Johan Hovold
The i2c subsystem currently blocks during adapter deregistration whenever there are consumers holding a reference.
Switch to using
of_get_i2c_adapter_by_node()which also takes a reference to the adapter module so that an attempt to unload the module while in use fails gracefully instead of blocking uninterruptibly.[...]
Applied, thanks!
[1/1] drm/vc4: hdmi: take i2c adapter module reference
commit: 7a4b7122a623e3d57fc15cf843a9d45fbd72c6ab
Best regards,
- Maíra