diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /sound/soc/codecs/cx20442.c | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'sound/soc/codecs/cx20442.c')
| -rw-r--r-- | sound/soc/codecs/cx20442.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 9f169c477108..f07a415c753f 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
| @@ -387,7 +387,7 @@ static int cx20442_register(struct cx20442_priv *cx20442) | |||
| 387 | 387 | ||
| 388 | codec->name = "CX20442"; | 388 | codec->name = "CX20442"; |
| 389 | codec->owner = THIS_MODULE; | 389 | codec->owner = THIS_MODULE; |
| 390 | codec->private_data = cx20442; | 390 | snd_soc_codec_set_drvdata(codec, cx20442); |
| 391 | 391 | ||
| 392 | codec->dai = &cx20442_dai; | 392 | codec->dai = &cx20442_dai; |
| 393 | codec->num_dai = 1; | 393 | codec->num_dai = 1; |