Gitweb: http://git.kernel.org/linus/6c5f1fed49f96a0600aa9a97ac3faf972c33a341
Commit: 6c5f1fed49f96a0600aa9a97ac3faf972c33a341
Parent: e47c796d58a21fc58b00dffb7265bb66de987773
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
AuthorDate: Wed Feb 17 14:30:44 2010 +0000
Committer: Mark Brown <broonie@opensource.wolfsonmicro.com>
CommitDate: Wed Feb 17 14:37:20 2010 +0000
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>
---
include/sound/soc.h | 2 +-
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 d9d88dd..5d234a8 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 c2008bc..e1c0336 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,
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
