---

yaml --- r: 157662 b: refs/heads/master c: 8b83a19 h: refs/heads/master v: v3
git-mirror · Jun 30, 2009 · ac94bfe · ac94bfe
1 parent c8eb4b2
commit ac94bfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb11d39ead79e5bc8ca42de86b9df8dec8b88681
+refs/heads/master: 8b83a19367dc3bdfef07634646bbad90f6cba898
diff --git a/trunk/sound/soc/codecs/wm8974.c b/trunk/sound/soc/codecs/wm8974.c
@@ -1,7 +1,7 @@
 /*
  * wm8974.c  --  WM8974 ALSA Soc Audio driver
  *
- * Copyright 2006 Wolfson Microelectronics PLC.
+ * Copyright 2006-2009 Wolfson Microelectronics PLC.
  *
  * Author: Liam Girdwood <linux@wolfsonmicro.com>
  *
@@ -357,7 +357,7 @@ static void pll_factors(unsigned int target, unsigned int source)
 
 	if ((Ndiv < 6) || (Ndiv > 12))
 		printk(KERN_WARNING
-			"WM8974 N value %u outwith recommended range!d\n",
+			"WM8974 N value %u outwith recommended range!\n",
 			Ndiv);
 
 	pll_div.n = Ndiv;
@@ -546,6 +546,7 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream,
 		adn |= 0x1 << 1;
 		break;
 	case SNDRV_PCM_RATE_44100:
+	case SNDRV_PCM_RATE_48000:
 		break;
 	}
 
@@ -822,7 +823,7 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id);
 
 static struct i2c_driver wm8974_i2c_driver = {
 	.driver = {
-		.name = "WM8974 I2C Codec",
+		.name = "WM8974",
 		.owner = THIS_MODULE,
 	},
 	.probe =    wm8974_i2c_probe,