Changeset 112 for GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712.c

Timestamp:

May 31, 2007, 6:45:32 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.0rc1. Builds.

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712.c

@@ -99 +99 @@
 #define ICE1712_SUBDEVICE_DELTA44       0x121433d6
 #define ICE1712_SUBDEVICE_AUDIOPHILE    0x121434d6
+#define ICE1712_SUBDEVICE_DELTA1010LT   0x12143bd6
 #define ICE1712_SUBDEVICE_EWX2496       0x3b153011
 #define ICE1712_SUBDEVICE_EWS88MT       0x3b151511
@@ -1185 +1186 @@
                 nval |= 0x04;
         if (val != nval) {
+                reg[1] = nval;
                 if (snd_i2c_sendbytes(ice->cs8427, reg, 2) != 2) {
                         snd_i2c_unlock(ice->i2c);
@@ -4540 +4542 @@
                                     const struct pci_device_id *id)
 {
-        static int dev = 0;
+        static int dev;
         snd_card_t *card;
         ice1712_t *ice;
@@ -4609 +4611 @@
         case ICE1712_SUBDEVICE_AUDIOPHILE:
                 strcpy(card->shortname, "M Audio Audiophile 24/96");
+                break;
+        case ICE1712_SUBDEVICE_DELTA1010LT:
+                strcpy(card->shortname, "M Audio Delta 1010LT");
                 break;
         case ICE1712_SUBDEVICE_EWX2496: