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/ak4104.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/ak4104.c')
| -rw-r--r-- | sound/soc/codecs/ak4104.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index bdeb10dfd887..192aebda3029 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c | |||
| @@ -222,7 +222,7 @@ static int ak4104_spi_probe(struct spi_device *spi) | |||
| 222 | codec->owner = THIS_MODULE; | 222 | codec->owner = THIS_MODULE; |
| 223 | codec->dai = &ak4104_dai; | 223 | codec->dai = &ak4104_dai; |
| 224 | codec->num_dai = 1; | 224 | codec->num_dai = 1; |
| 225 | codec->private_data = ak4104; | 225 | snd_soc_codec_set_drvdata(codec, ak4104); |
| 226 | codec->control_data = spi; | 226 | codec->control_data = spi; |
| 227 | codec->reg_cache = ak4104->reg_cache; | 227 | codec->reg_cache = ak4104->reg_cache; |
| 228 | codec->reg_cache_size = AK4104_NUM_REGS; | 228 | codec->reg_cache_size = AK4104_NUM_REGS; |