diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-12-02 11:42:00 +0100 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-06 14:48:34 +0100 | 
| commit | e2943efa4fda376903974e33298b29091fc596b3 (patch) | |
| tree | f018f5e57baa7f4af32efefc3f1ae0358641bc5c /sound/pci/oxygen/oxygen_lib.c | |
| parent | 9719fcaa6a82be59a2d7767725e5cd8233c6a387 (diff) | |
| download | olio-linux-3.10-e2943efa4fda376903974e33298b29091fc596b3.tar.xz olio-linux-3.10-e2943efa4fda376903974e33298b29091fc596b3.zip  | |
ALSA: oxygen: show correct package ID
Instead of the hardcoded "CMI8788", show the actual chip name.
Note: This is neither what the chip is (it's always the same),
      nor what the chip is actually called.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index e581e7ab216..3078ed66ad6 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c @@ -202,7 +202,13 @@ static void oxygen_proc_read(struct snd_info_entry *entry,  	struct oxygen *chip = entry->private_data;  	int i, j; -	snd_iprintf(buffer, "CMI8788:\n"); +	switch (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_PACKAGE_ID_MASK) { +	case OXYGEN_PACKAGE_ID_8786: i = '6'; break; +	case OXYGEN_PACKAGE_ID_8787: i = '7'; break; +	case OXYGEN_PACKAGE_ID_8788: i = '8'; break; +	default:                     i = '?'; break; +	} +	snd_iprintf(buffer, "CMI878%c:\n", i);  	for (i = 0; i < OXYGEN_IO_SIZE; i += 0x10) {  		snd_iprintf(buffer, "%02x:", i);  		for (j = 0; j < 0x10; ++j)  |