From: Dave Airlie <airlied@redhat.com>
Date: Tue, 22 May 2018 00:20:45 +0000 (+1000)
Subject: Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1dd6eb88af7a511b090fa847ed826bf3accf3bce;p=linux.git

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

Please incorporate support for TDA998x I2C driver CEC

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180424095456.GA32460@rmk-PC.armlinux.org.uk
---

1dd6eb88af7a511b090fa847ed826bf3accf3bce
diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index 421c8a72369e3,eb9916bd84a49..6ebd8842dbcc8
--- a/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)