Changeset 206 for GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c

Timestamp:

Jun 17, 2007, 1:16:58 AM (18 years ago)

Author:

Brendan Oakley

Message:

Applied fixes from trunk to ReSync branch, fixed up additional conflicts, errors, and warnings.

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c (modified) (3 diffs)

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

@@ -1002 +1002 @@
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_single, \
   snd_fm801_get_single, snd_fm801_put_single, \
-  reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  0, reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1047 +1047 @@
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_double, \
   snd_fm801_get_double, snd_fm801_put_double, \
-  reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
+  0, reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1189 +1189 @@
         int err;
         static ac97_bus_ops_t ops = {
-            0, snd_fm801_codec_write,
+            0, 0, snd_fm801_codec_write,
             snd_fm801_codec_read, 0,0
         };