Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

Please incorporate support for TDA998x I2C driver CEC

Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index 421c8a72369e3b77abd9a869badba552defd1056,eb9916bd84a49db9b62bdc182f4a06523329bc14..6ebd8842dbcc8649c887d689becf69e017f5146b
--- 1/drivers/gpu/drm/i2c/tda998x_drv.c
--- 2/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -1600,8 -1783,14 +1783,13 @@@ fail
        /* if encoder_init fails, the encoder slave is never registered,
         * so cleanup here:
         */
 -      if (priv->cec)
 -              i2c_unregister_device(priv->cec);
 +      i2c_unregister_device(priv->cec);
-       return -ENXIO;
+       if (priv->cec_notify)
+               cec_notifier_put(priv->cec_notify);
+       if (client->irq)
+               free_irq(client->irq, priv);
+ err_irq:
+       return ret;
  }
  
  static void tda998x_encoder_prepare(struct drm_encoder *encoder)