aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-02-17 14:30:44 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-02-17 14:37:20 +0000
commit6c5f1fed49f96a0600aa9a97ac3faf972c33a341 (patch)
tree4a5770faede21a49e604321ac19679eb3175deb8
parente47c796d58a21fc58b00dffb7265bb66de987773 (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.h2
-rw-r--r--sound/soc/soc-core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index d9d88dd9720..5d234a8c250 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -521,7 +521,7 @@ struct snd_soc_card {
int (*set_bias_level)(struct snd_soc_card *,
enum snd_soc_bias_level level);
- int pmdown_time;
+ long pmdown_time;
/* CPU <--> Codec DAI links */
struct snd_soc_dai_link *dai_link;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c2008bc9c64..e1c0336868e 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,
struct snd_soc_device *socdev = dev_get_drvdata(dev);
struct snd_soc_card *card = socdev->card;
- return sprintf(buf, "%d\n", card->pmdown_time);
+ return sprintf(buf, "%ld\n", card->pmdown_time);
}
static ssize_t pmdown_time_set(struct device *dev,