Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l56', 'asoc/topic...

[pandora-kernel.git] / sound / soc / codecs / cx20442.c

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index d5fd00a..8f95b03 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -253,7 +253,7 @@ static void v253_close(struct tty_struct *tty)
        /* Prevent the codec driver from further accessing the modem */
        codec->hw_write = NULL;
        cx20442->control_data = NULL;
-       codec->card->pop_time = 0;
+       codec->component.card->pop_time = 0;
 }
 
 /* Line discipline .hangup() */
@@ -281,7 +281,7 @@ static void v253_receive(struct tty_struct *tty,
                /* Set up codec driver access to modem controls */
                cx20442->control_data = tty;
                codec->hw_write = (hw_write_t)tty->ops->write;
-               codec->card->pop_time = 1;
+               codec->component.card->pop_time = 1;
        }
 }
 
@@ -372,7 +372,7 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec)
 
        snd_soc_codec_set_drvdata(codec, cx20442);
        codec->hw_write = NULL;
-       codec->card->pop_time = 0;
+       codec->component.card->pop_time = 0;
 
        return 0;
 }
@@ -383,8 +383,8 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
        struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
 
        if (cx20442->control_data) {
-                       struct tty_struct *tty = cx20442->control_data;
-                       tty_hangup(tty);
+               struct tty_struct *tty = cx20442->control_data;
+               tty_hangup(tty);
        }
 
        if (!IS_ERR(cx20442->por)) {