Commit 87b61902 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

sound: oxygen: do not try to restore nonexistent EEPROM

On cards where the EEPROM was deliberately omitted, we do not need to
try to restore the EEPROM's contents.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 17d857be
...@@ -278,7 +278,11 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[]) ...@@ -278,7 +278,11 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
static void oxygen_restore_eeprom(struct oxygen *chip, static void oxygen_restore_eeprom(struct oxygen *chip,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
if (oxygen_read_eeprom(chip, 0) != OXYGEN_EEPROM_ID) { u16 eeprom_id;
eeprom_id = oxygen_read_eeprom(chip, 0);
if (eeprom_id != OXYGEN_EEPROM_ID &&
(eeprom_id != 0xffff || id->subdevice != 0x8788)) {
/* /*
* This function gets called only when a known card model has * This function gets called only when a known card model has
* been detected, i.e., we know there is a valid subsystem * been detected, i.e., we know there is a valid subsystem
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment