From 1cb6fea2924ec72bd496cba89dbb92a1bd84884a Mon Sep 17 00:00:00 2001 From: Markus Bollinger Date: Fri, 31 Mar 2006 12:48:51 +0200 Subject: [PATCH] --- yaml --- r: 25267 b: refs/heads/master c: 0bd43b5bc9e61e9dc48ad5ee68737316e5d94b60 h: refs/heads/master i: 25265: df0a152b0efba7851609ef3781a71cc1494228d6 25263: cb24fdcfa0be5f9e4eb754cb40e06ed165256186 v: v3 --- [refs] | 2 +- trunk/sound/pci/pcxhr/pcxhr_core.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 45be40573823..2f821324b577 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce7415f496e21775156b08452d22211f8c3ccc53 +refs/heads/master: 0bd43b5bc9e61e9dc48ad5ee68737316e5d94b60 diff --git a/trunk/sound/pci/pcxhr/pcxhr_core.c b/trunk/sound/pci/pcxhr/pcxhr_core.c index fdc652c6992d..c40f59062684 100644 --- a/trunk/sound/pci/pcxhr/pcxhr_core.c +++ b/trunk/sound/pci/pcxhr/pcxhr_core.c @@ -274,12 +274,9 @@ int pcxhr_load_xilinx_binary(struct pcxhr_mgr *mgr, const struct firmware *xilin /* test first xilinx */ chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); - if (!second) { - if (chipsc & PCXHR_CHIPSC_GPI_USERI) { - snd_printdd("no need to load first xilinx\n"); - return 0; /* first xilinx is already present and cannot be reset */ - } - } else { + /* REV01 cards do not support the PCXHR_CHIPSC_GPI_USERI bit anymore */ + /* this bit will always be 1; no possibility to test presence of first xilinx */ + if(second) { if ((chipsc & PCXHR_CHIPSC_GPI_USERI) == 0) { snd_printk(KERN_ERR "error loading first xilinx\n"); return -EINVAL;