From: Mark Brown Date: Wed, 17 Feb 2010 14:30:44 +0000 (+0000) Subject: ASoC: Make pmdown_time a long X-Git-Tag: v2.6.34-rc1~3^2~3^2~7 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;ds=sidebyside;h=6c5f1fed49f96a0600aa9a97ac3faf972c33a341;p=safe%2Fjmp%2Flinux-2.6 ASoC: Make pmdown_time a long Fixes a warning. Signed-off-by: Mark Brown Acked-by: Liam Girdwood --- 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,