]> Pileus Git - ~andy/linux/commitdiff
[ALSA] ice1724 (juli) - forced analog doughter board detection
authorJaroslav Kysela <perex@suse.cz>
Thu, 10 Nov 2005 06:51:31 +0000 (07:51 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 3 Jan 2006 11:15:57 +0000 (12:15 +0100)
Modules: ICE1712 driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/pci/ice1712/juli.c

index 2437876a44e4e0f73c7e6f84f007022763bc2d6f..a5e04a3136b15e596d8f11a5b04c839f0b9cc811 100644 (file)
@@ -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");