summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Martínez2014-06-17 16:17:03 +0200
committerRussell King2014-06-26 11:52:03 +0200
commit2e48cecb55435e10c93c6aface1a1c7ef32f4e71 (patch)
tree9e5823a8ddbf9f5918020d28be2ad223e7bf49f5
parentLinux 3.15 (diff)
downloadkernel-qcow2-linux-2e48cecb55435e10c93c6aface1a1c7ef32f4e71.tar.gz
kernel-qcow2-linux-2e48cecb55435e10c93c6aface1a1c7ef32f4e71.tar.xz
kernel-qcow2-linux-2e48cecb55435e10c93c6aface1a1c7ef32f4e71.zip
drm/i2c: tda998x: move drm_i2c_encoder_destroy call
Currently tda998x_encoder_destroy() calls cec_write() and reg_clear(), as part of the release procedure. Such calls need to access the I2C bus and therefore, we need to call them before drm_i2c_encoder_destroy() which unregisters the I2C device. This commit moves the latter so it's done afterwards. Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> Signed-off-by: Ezequiel García <ezequiel@vanguardiasur.com.ar> Cc: <stable@vger.kernel.org> #v3.9+ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/gpu/drm/i2c/tda998x_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 48af5cac1902..b98c969aeffa 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1183,7 +1183,6 @@ static void
tda998x_encoder_destroy(struct drm_encoder *encoder)
{
struct tda998x_priv *priv = to_tda998x_priv(encoder);
- drm_i2c_encoder_destroy(encoder);
/* disable all IRQs and free the IRQ handler */
cec_write(priv, REG_CEC_RXSHPDINTENA, 0);
@@ -1193,6 +1192,7 @@ tda998x_encoder_destroy(struct drm_encoder *encoder)
if (priv->cec)
i2c_unregister_device(priv->cec);
+ drm_i2c_encoder_destroy(encoder);
kfree(priv);
}