diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-17 09:30:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-17 09:37:20 -0500 |
commit | 6c5f1fed49f96a0600aa9a97ac3faf972c33a341 (patch) | |
tree | 4a5770faede21a49e604321ac19679eb3175deb8 | |
parent | e47c796d58a21fc58b00dffb7265bb66de987773 (diff) |
ASoC: Make pmdown_time a long
Fixes a warning.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | include/sound/soc.h | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index d9d88dd9720d..5d234a8c2506 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -521,7 +521,7 @@ struct snd_soc_card { | |||
521 | int (*set_bias_level)(struct snd_soc_card *, | 521 | int (*set_bias_level)(struct snd_soc_card *, |
522 | enum snd_soc_bias_level level); | 522 | enum snd_soc_bias_level level); |
523 | 523 | ||
524 | int pmdown_time; | 524 | long pmdown_time; |
525 | 525 | ||
526 | /* CPU <--> Codec DAI links */ | 526 | /* CPU <--> Codec DAI links */ |
527 | struct snd_soc_dai_link *dai_link; | 527 | struct snd_soc_dai_link *dai_link; |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c2008bc9c64a..e1c0336868e1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -136,7 +136,7 @@ static ssize_t pmdown_time_show(struct device *dev, | |||
136 | struct snd_soc_device *socdev = dev_get_drvdata(dev); | 136 | struct snd_soc_device *socdev = dev_get_drvdata(dev); |
137 | struct snd_soc_card *card = socdev->card; | 137 | struct snd_soc_card *card = socdev->card; |
138 | 138 | ||
139 | return sprintf(buf, "%d\n", card->pmdown_time); | 139 | return sprintf(buf, "%ld\n", card->pmdown_time); |
140 | } | 140 | } |
141 | 141 | ||
142 | static ssize_t pmdown_time_set(struct device *dev, | 142 | static ssize_t pmdown_time_set(struct device *dev, |