diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:35:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:35:19 +0100 |
| commit | a31886669f6277a8576af6e917c3958c780a4ebf (patch) | |
| tree | 195338489a866f54af718a67122150bd78c5cc42 /sound/soc/samsung/s3c-i2s-v2.c | |
| parent | e7729a415315fcd9516912050d85d5aaebcededc (diff) | |
| parent | e65523ca79fd087d9888598eadeb9554e2bd2102 (diff) | |
| download | blackbird-op-linux-a31886669f6277a8576af6e917c3958c780a4ebf.tar.gz blackbird-op-linux-a31886669f6277a8576af6e917c3958c780a4ebf.zip | |
Merge tag 'asoc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.14
A few fixes, all in drivers. Nothing stands out particularly, the
biggest set of fixes is some build coverage issues from Sachin.
Diffstat (limited to 'sound/soc/samsung/s3c-i2s-v2.c')
| -rw-r--r-- | sound/soc/samsung/s3c-i2s-v2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index fefc56100349..79e7efb9283c 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -729,7 +729,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id, struct snd_soc_component_driver *cmp_drv, struct snd_soc_dai_driver *dai_drv) { - struct snd_soc_dai_ops *ops = drv->ops; + struct snd_soc_dai_ops *ops = dai_drv->ops; ops->trigger = s3c2412_i2s_trigger; if (!ops->hw_params) @@ -742,8 +742,8 @@ int s3c_i2sv2_register_component(struct device *dev, int id, if (!ops->delay) ops->delay = s3c2412_i2s_delay; - drv->suspend = s3c2412_i2s_suspend; - drv->resume = s3c2412_i2s_resume; + dai_drv->suspend = s3c2412_i2s_suspend; + dai_drv->resume = s3c2412_i2s_resume; return snd_soc_register_component(dev, cmp_drv, dai_drv, 1); } |
