From 9900eab8da40f771c2793e24c77f7967ead96854 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 17 Feb 2010 14:30:44 +0000 Subject: [PATCH] --- yaml --- r: 182897 b: refs/heads/master c: 6c5f1fed49f96a0600aa9a97ac3faf972c33a341 h: refs/heads/master i: 182895: 6bca1d11650fd8d2e5ecee9d30ab8ac61dbef8f0 v: v3 --- [refs] | 2 +- trunk/include/sound/soc.h | 2 +- trunk/sound/soc/soc-core.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3224fbb1014e..8550f9cdea9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e47c796d58a21fc58b00dffb7265bb66de987773 +refs/heads/master: 6c5f1fed49f96a0600aa9a97ac3faf972c33a341 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index d9d88dd9720d..5d234a8c2506 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/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/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index c2008bc9c64a..e1c0336868e1 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/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,