From: Andy Shevchenko Date: Mon, 21 Dec 2015 17:09:52 +0000 (+0200) Subject: ALSA: fm801: propagate TUNER_ONLY bit when autodetected X-Git-Tag: v3.2.77~69 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d9c17bf8649d90791b7319ad9a51a5da2daba2;p=pandora-kernel.git ALSA: fm801: propagate TUNER_ONLY bit when autodetected commit dbec6719ac036f68568d8488805d41346c021eff upstream. The commit d7ba858a7f7a (ALSA: fm801: implement TEA575x tuner autodetection) brings autodetection to the driver. However the autodetection algorithm misses the TUNER_ONLY bit if it is supplied by the user. Thus, user gets weird messages and no card registered. snd_fm801 0000:0d:01.0: detected TEA575x radio type SF64-PCR snd_fm801 0000:0d:01.0: AC'97 interface is busy (1) snd_fm801 0000:0d:01.0: AC'97 interface is busy (1) ... snd_fm801 0000:0d:01.0: AC'97 0 does not respond - RESET snd_fm801 0000:0d:01.0: AC'97 interface is busy (1) snd_fm801 0000:0d:01.0: AC'97 interface is busy (1) snd_fm801 0000:0d:01.0: AC'97 0 access is not valid [0x0], removing mixer. snd_fm801: probe of 0000:0d:01.0 failed with error -5 Do a copy of TUNER_ONLY bit to be applied after autodetection is done. Fixes: d7ba858a7f7a (ALSA: fm801: implement TEA575x tuner autodetection) Signed-off-by: Andy Shevchenko Cc: Ondrej Zary Signed-off-by: Takashi Iwai Signed-off-by: Ben Hutchings --- diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index ec05ef5a5abf..9aeb1c06a555 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1244,6 +1244,8 @@ static int __devinit snd_fm801_create(struct snd_card *card, return -ENODEV; } } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) { + unsigned int tuner_only = tea575x_tuner & TUNER_ONLY; + /* autodetect tuner connection */ for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) { chip->tea575x_tuner = tea575x_tuner; @@ -1257,6 +1259,8 @@ static int __devinit snd_fm801_create(struct snd_card *card, snd_printk(KERN_ERR "TEA575x radio not found\n"); chip->tea575x_tuner = TUNER_DISABLED; } + + chip->tea575x_tuner |= tuner_only; } if (!(chip->tea575x_tuner & TUNER_DISABLED)) { strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,