---

yaml --- r: 332119 b: refs/heads/master c: 0534951 h: refs/heads/master i: 332117: b798ef1 332115: c4291af 332111: d54a4e3 v: v3
git-mirror · Sep 21, 2012 · c45ca68 · c45ca68
1 parent 57fb28e
commit c45ca68
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b306e84f9a15e465812d9b66f8d6ecadae806f4c
+refs/heads/master: 0534951ba493a97eee646f62101cf88fac2308c6
diff --git a/trunk/include/sound/wm8960.h b/trunk/include/sound/wm8960.h
@@ -18,8 +18,6 @@
 struct wm8960_data {
 	bool capless;  /* Headphone outputs configured in capless mode */
 
-	int dres;  /* Discharge resistance for headphone outputs */
-
 	bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 

diff --git a/trunk/sound/soc/codecs/wm8960.c b/trunk/sound/soc/codecs/wm8960.c
@@ -962,11 +962,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
 	if (!pdata) {
 		dev_warn(codec->dev, "No platform data supplied\n");
 	} else {
-		if (pdata->dres > WM8960_DRES_MAX) {
-			dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres);
-			pdata->dres = 0;
-		}
-
 		if (pdata->capless)
 			wm8960->set_bias_level = wm8960_set_bias_level_capless;
 	}