Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / drivers / media / platform / cec-gpio / cec-gpio.c

diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
index 7be91e712c4ae20f18c1e66d63a952b4ff130ee0..42d2c2cd9a786cd0e5615a45951cf876a4b1a0c8 100644 (file)
--- a/drivers/media/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/platform/cec-gpio/cec-gpio.c
@@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
        return 0;
 
 unreg_notifier:
-       cec_notifier_cec_adap_unregister(cec->notifier);
+       cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
 del_adap:
        cec_delete_adapter(cec->adap);
        return ret;
@@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
 {
        struct cec_gpio *cec = platform_get_drvdata(pdev);
 
-       cec_notifier_cec_adap_unregister(cec->notifier);
+       cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
        cec_unregister_adapter(cec->adap);
        return 0;
 }