Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bd43b5b authored by Markus Bollinger's avatar Markus Bollinger Committed by Jaroslav Kysela
Browse files

[ALSA] pcxhr - Fix the crash with REV01 board 



On a new board revision for pcxhr boards, the
PCXHR_CHIPSC_GPI_USERI bit is no more supported.
The cards concerned have a REV01 in their PCI ID.

As the current driver tests this bit and does not load the
first Xilinx binary when it's 1, the card will crash on Xilinx
access over PCI. (the PCI will freeze ....)

The fix (fix to version 1.0.11rc4) works for both REV00 and
REV01 cards.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ce7415f4

sound/pci/pcxhr/pcxhr_core.c

+3 −6
Original line number Diff line number Diff line
@@ -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;