aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/tegra-cec/tegra_cec.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-10-04 13:04:24 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-10-07 12:47:43 +0200
commit10d8f308ba3e4d2c8753dd7a143af6f4a96cc29b (patch)
tree2a9e6cbcd20066d662f395458a6dcbe953723ab3 /drivers/media/platform/tegra-cec/tegra_cec.c
parentdrm/mcde: Fix reference to DOC comment (diff)
downloadlinux-dev-10d8f308ba3e4d2c8753dd7a143af6f4a96cc29b.tar.xz
linux-dev-10d8f308ba3e4d2c8753dd7a143af6f4a96cc29b.zip
cec: add cec_adapter to cec_notifier_cec_adap_unregister()
It is possible for one HDMI connector to have multiple CEC adapters. The typical real-world scenario is that where one adapter is used when the device is in standby, and one that's better/smarter when the device is powered up. The cec-notifier changes were made with that in mind, but I missed that in order to support this you need to tell cec_notifier_cec_adap_unregister() which adapter you are unregistering from the notifier. Add this additional argument. It is currently unused, but once all drivers use this, the CEC core will be adapted for these use-cases. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/e9fc8740-6be6-43a7-beee-ce2d7b54936e@xs4all.nl
Diffstat (limited to 'drivers/media/platform/tegra-cec/tegra_cec.c')
-rw-r--r--drivers/media/platform/tegra-cec/tegra_cec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.c b/drivers/media/platform/tegra-cec/tegra_cec.c
index a632602131f2..a99caac59f44 100644
--- a/drivers/media/platform/tegra-cec/tegra_cec.c
+++ b/drivers/media/platform/tegra-cec/tegra_cec.c
@@ -409,7 +409,7 @@ static int tegra_cec_probe(struct platform_device *pdev)
return 0;
err_notifier:
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
err_adapter:
cec_delete_adapter(cec->adap);
err_clk:
@@ -423,7 +423,7 @@ static int tegra_cec_remove(struct platform_device *pdev)
clk_disable_unprepare(cec->clk);
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap);
return 0;