drm/i2c: tda998x: move audio mutex initialisation
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 17 Nov 2016 23:55:00 +0000 (23:55 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Thu, 17 Nov 2016 23:59:39 +0000 (23:59 +0000)
We will need the audio mutex initialised in all cases, so lets move this
to be early, rather than only being initialised for the DT case.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
drivers/gpu/drm/i2c/tda998x_drv.c

index 088900d78ceb5c2946705c4252d3f5ec296a01ce..168c0b4b8f47788a34b392a05c16f1094fe2fa88 100644 (file)
@@ -1405,6 +1405,8 @@ static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv)
        int rev_lo, rev_hi, ret;
        unsigned short cec_addr;
 
+       mutex_init(&priv->audio_mutex); /* Protect access from audio thread */
+
        priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3);
        priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1);
        priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5);
@@ -1519,8 +1521,6 @@ static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv)
                priv->vip_cntrl_2 = video;
        }
 
-       mutex_init(&priv->audio_mutex); /* Protect access from audio thread */
-
        ret = tda998x_get_audio_ports(priv, np);
        if (ret)
                goto fail;