Merge remote-tracking branch 'asoc/topic/simple' into asoc-next

fbbeb391 · Mark Brown · ae14dbfa · 7c376711 · fbbeb391
Commit fbbeb391 authored May 27, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sound/soc/generic/simple-card.c sound/soc/generic/simple-card.c +1 -0

No files found.
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -643,6 +643,7 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 static struct platform_driver asoc_simple_card = {
 	.driver = {
 		.name = "asoc-simple-card",
+		.pm = &snd_soc_pm_ops,
 		.of_match_table = asoc_simple_of_match,
 	},
 	.probe = asoc_simple_card_probe,