---

yaml --- r: 182897 b: refs/heads/master c: 6c5f1fe h: refs/heads/master i: 182895: 6bca1d1 v: v3
git-mirror · Feb 17, 2010 · 9900eab · 9900eab
1 parent 6731c1f
commit 9900eab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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,