diff options
authorClemens Ladisch <clemens@ladisch.de>2009-09-02 18:25:39 +0200
committerTakashi Iwai <tiwai@suse.de>2009-09-03 07:38:06 +0200
commit92653453c3015c083b9fe0ad48261c6b2267d482 (patch)
parentb91ab72b830e1494c2c7f8de05ccb2ab2c9cfb26 (diff)
sound: oxygen: handle cards with missing EEPROM
The card model detection code introduced in 2.6.30 that tries to work around partially broken EEPROM contents by reading the EEPROM directly does not handle cards where the EEPROM has been omitted. In this case, we have to use the default ID to allow the driver to load. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Reported-and-tested-by: Ozan Çağlayan <ozan@pardus.org.tr> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 312251d39696..9a8936e20744 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -260,6 +260,9 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
* chip didn't if the first EEPROM word was overwritten.
subdevice = oxygen_read_eeprom(chip, 2);
+ /* use default ID if EEPROM is missing */
+ if (subdevice == 0xffff)
+ subdevice = 0x8788;
* We use only the subsystem device ID for searching because it is
* unique even without the subsystem vendor ID, which may have been