Merge branch 'master'

1 files changed, 3 insertions, 6 deletions

diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index fdc652c6992d..c40f59062684 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/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;