| Message ID | 1450717796-66115-1-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 21 Dec 2015 18:09:52 +0100, Andy Shevchenko wrote: > > 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 <andriy.shevchenko@linux.intel.com> > Cc: Ondrej Zary <linux@rainbow-software.org> Applied all five patches now. Thanks. Takashi > --- > sound/pci/fm801.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c > index 4c9d804..6114d81 100644 > --- a/sound/pci/fm801.c > +++ b/sound/pci/fm801.c > @@ -1269,6 +1269,8 @@ static int 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; > @@ -1283,6 +1285,8 @@ static int snd_fm801_create(struct snd_card *card, > dev_err(card->dev, "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, > -- > 2.6.4 > >
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 4c9d804..6114d81 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1269,6 +1269,8 @@ static int 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; @@ -1283,6 +1285,8 @@ static int snd_fm801_create(struct snd_card *card, dev_err(card->dev, "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,
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 <andriy.shevchenko@linux.intel.com> Cc: Ondrej Zary <linux@rainbow-software.org> --- sound/pci/fm801.c | 4 ++++ 1 file changed, 4 insertions(+)