---

yaml --- r: 15917 b: refs/heads/master c: fd6715e h: refs/heads/master i: 15915: ff48480 v: v3
git-mirror · Jan 3, 2006 · f863c59 · f863c59
1 parent 8315ab2
commit f863c59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1b8f5f0e4aabd4b47648dd9465fb750e07da9fb
+refs/heads/master: fd6715e564a53bc3fca22e4f0a9d76b6b72afdb5
diff --git a/trunk/sound/pci/ice1712/juli.c b/trunk/sound/pci/ice1712/juli.c
@@ -175,7 +175,14 @@ static int __devinit juli_init(ice1712_t *ice)
 	if (err < 0)
 		return err;
 
-	ice->spec.juli.analog = ice->gpio.get_data(ice) & GPIO_ANALOG_PRESENT;
+#if 0
+        /* it seems that the analog doughter board detection does not work
+           reliably, so force the analog flag; it should be very rare
+           to use Juli@ without the analog doughter board */
+	ice->spec.juli.analog = (ice->gpio.get_data(ice) & GPIO_ANALOG_PRESENT) ? 0 : 1;
+#else
+        ice->spec.juli.analog = 1;
+#endif
 
 	if (ice->spec.juli.analog) {
 		printk(KERN_INFO "juli@: analog I/O detected\n");