diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-12 17:30:13 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-12 17:30:13 +0300 |
| commit | 8f66439eec46d652255b9351abebb540ee5b2fd9 (patch) | |
| tree | 94f4a41dc343cf769cd92f1f7711e9ce8ad43728 /sound/soc/atmel/atmel-classd.c | |
| parent | 22ec656bcc3f38207ad5476ebad1e5005fb0f1ff (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
| download | linux-8f66439eec46d652255b9351abebb540ee5b2fd9.tar.xz | |
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.
Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'sound/soc/atmel/atmel-classd.c')
| -rw-r--r-- | sound/soc/atmel/atmel-classd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c index 7ae46c2647d4..b7ef8c59b49a 100644 --- a/sound/soc/atmel/atmel-classd.c +++ b/sound/soc/atmel/atmel-classd.c @@ -301,6 +301,14 @@ static int atmel_classd_codec_probe(struct snd_soc_codec *codec) return 0; } +static int atmel_classd_codec_resume(struct snd_soc_codec *codec) +{ + struct snd_soc_card *card = snd_soc_codec_get_drvdata(codec); + struct atmel_classd *dd = snd_soc_card_get_drvdata(card); + + return regcache_sync(dd->regmap); +} + static struct regmap *atmel_classd_codec_get_remap(struct device *dev) { return dev_get_regmap(dev, NULL); @@ -308,6 +316,7 @@ static struct regmap *atmel_classd_codec_get_remap(struct device *dev) static struct snd_soc_codec_driver soc_codec_dev_classd = { .probe = atmel_classd_codec_probe, + .resume = atmel_classd_codec_resume, .get_regmap = atmel_classd_codec_get_remap, .component_driver = { .controls = atmel_classd_snd_controls, |