From f863c5952fe4a0ef63ad4c436e39f889fb3ab610 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 10 Nov 2005 07:51:31 +0100 Subject: [PATCH] --- yaml --- r: 15917 b: refs/heads/master c: fd6715e564a53bc3fca22e4f0a9d76b6b72afdb5 h: refs/heads/master i: 15915: ff48480928bc6e4d0f3df68f741f56517fdd2aac v: v3 --- [refs] | 2 +- trunk/sound/pci/ice1712/juli.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 437db2e00612..4bd248f0c4a2 100644 --- 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 index 2437876a44e4..a5e04a3136b1 100644 --- 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");