96 files changed, 903 insertions, 733 deletions

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index fac51eef2725..9473fca9681d 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -42,7 +42,7 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Universal interface for Audio Codec '97");
 MODULE_LICENSE("GPL");
 
-static int enable_loopback;
+static bool enable_loopback;
 
 module_param(enable_loopback, bool, 0444);
 MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 6e311184bb10..9d91d61902b4 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -66,7 +66,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for the AD1889 soundcard.");
 
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable AD1889 soundcard.");
 
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index ef85ac5d9007..bdd6164e9c7e 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -48,7 +48,7 @@ MODULE_SUPPORTED_DEVICE("{{ALI,M5451,pci},{ALI,M5451}}");
 static int index = SNDRV_DEFAULT_IDX1;  /* Index */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
 static int pcm_channels = 32;
-static int spdif;
+static bool spdif;
 
 module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for ALI M5451 PCI Audio.");
@@ -60,7 +60,7 @@ module_param(spdif, bool, 0444);
 MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 8dc77a0a5d8b..8196e229b2df 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -115,7 +115,14 @@ MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS300},{Avance Logic,ALS300+}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for ALS300 sound card.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for ALS300 sound card.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable ALS300 sound card.");
 
 struct snd_als300 {
         unsigned long port;
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 28ef40e01cc2..3269b8011ea9 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -90,7 +90,7 @@ MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS];
 #endif
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index f4b9e2b7ae87..e8de831f98bc 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -23,8 +23,11 @@
  */
 
 #include "hpi_internal.h"
+#include "hpi_version.h"
 #include "hpimsginit.h"
 #include "hpioctl.h"
+#include "hpicmn.h"
+
 
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -44,7 +47,8 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("AudioScience inc. <support@audioscience.com>");
-MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx");
+MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx "
+                        HPI_VER_STRING);
 
 #if defined CONFIG_SND_DEBUG_VERBOSE
 /**
@@ -63,8 +67,8 @@ MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-static int enable_hpi_hwdep = 1;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable_hpi_hwdep = 1;
 
 module_param_array(index, int, NULL, S_IRUGO);
 MODULE_PARM_DESC(index, "ALSA index value for AudioScience soundcard.");
@@ -119,12 +123,7 @@ struct clk_cache {
 struct snd_card_asihpi {
         struct snd_card *card;
         struct pci_dev *pci;
-        u16 adapter_index;
-        u32 serial_number;
-        u16 type;
-        u16 version;
-        u16 num_outstreams;
-        u16 num_instreams;
+        struct hpi_adapter *hpi;
 
         u32 h_mixer;
         struct clk_cache cc;
@@ -135,6 +134,8 @@ struct snd_card_asihpi {
         u16 update_interval_frames;
         u16 in_max_chans;
         u16 out_max_chans;
+        u16 in_min_chans;
+        u16 out_min_chans;
 };
 
 /* Per stream data */
@@ -495,6 +496,7 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
 
                 snd_printdd("stream_host_buffer_attach status 0x%x\n",
                                 dpcm->hpi_buffer_attached);
+
         }
         bytes_per_sec = params_rate(params) * params_channels(params);
         width = snd_pcm_format_width(params_format(params));
@@ -757,8 +759,7 @@ static void snd_card_asihpi_timer_function(unsigned long data)
                 if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                         pcm_buf_dma_ofs = ds->pcm_buf_host_rw_ofs - bytes_avail;
                         if (state == HPI_STATE_STOPPED) {
-                                if ((bytes_avail == 0) &&
-                                    (on_card_bytes < ds->pcm_buf_host_rw_ofs)) {
+                                if (bytes_avail == 0) {
                                         hpi_handle_error(hpi_stream_start(ds->h_stream));
                                         snd_printdd("P%d start\n", s->number);
                                         ds->drained_count = 0;
@@ -767,7 +768,7 @@ static void snd_card_asihpi_timer_function(unsigned long data)
                                 snd_printd(KERN_WARNING "P%d drained\n",
                                                 s->number);
                                 ds->drained_count++;
-                                if (ds->drained_count > 2) {
+                                if (ds->drained_count > 20) {
                                         snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
                                         continue;
                                 }
@@ -888,8 +889,8 @@ static void snd_card_asihpi_timer_function(unsigned long data)
                                                         pd, xfer2));
                                 }
                         }
-                        ds->pcm_buf_host_rw_ofs = ds->pcm_buf_host_rw_ofs + xfercount;
-                        ds->pcm_buf_elapsed_dma_ofs = pcm_buf_dma_ofs;
+                        ds->pcm_buf_host_rw_ofs += xfercount;
+                        ds->pcm_buf_elapsed_dma_ofs += xfercount;
                         snd_pcm_period_elapsed(s);
                 }
         }
@@ -902,7 +903,9 @@ static void snd_card_asihpi_timer_function(unsigned long data)
 static int snd_card_asihpi_playback_ioctl(struct snd_pcm_substream *substream,
                                           unsigned int cmd, void *arg)
 {
-        snd_printddd(KERN_INFO "P%d ioctl %d\n", substream->number, cmd);
+        char name[16];
+        snd_pcm_debug_name(substream, name, sizeof(name));
+        snd_printddd(KERN_INFO "%s ioctl %d\n", name, cmd);
         return snd_pcm_lib_ioctl(substream, cmd, arg);
 }
 
@@ -927,21 +930,23 @@ snd_card_asihpi_playback_pointer(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
         snd_pcm_uframes_t ptr;
+        char name[16];
+        snd_pcm_debug_name(substream, name, sizeof(name));
 
         ptr = bytes_to_frames(runtime, dpcm->pcm_buf_dma_ofs  % dpcm->buffer_bytes);
-        snd_printddd("P%d pointer = 0x%04lx\n", substream->number, (unsigned long)ptr);
+        snd_printddd("%s pointer = 0x%04lx\n", name, (unsigned long)ptr);
         return ptr;
 }
 
-static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
-                                                u32 h_stream,
-                                                struct snd_pcm_hardware *pcmhw)
+static u64 snd_card_asihpi_playback_formats(struct snd_card_asihpi *asihpi,
+                                                u32 h_stream)
 {
         struct hpi_format hpi_format;
         u16 format;
         u16 err;
         u32 h_control;
         u32 sample_rate = 48000;
+        u64 formats = 0;
 
         /* on cards without SRC, must query at valid rate,
         * maybe set by external sync
@@ -956,41 +961,29 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
 
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
              format <= HPI_FORMAT_PCM24_SIGNED; format++) {
-                err = hpi_format_create(&hpi_format,
-                                        2, format, sample_rate, 128000, 0);
+                err = hpi_format_create(&hpi_format, asihpi->out_max_chans,
+                                        format, sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_outstream_query_format(h_stream,
-                                                        &hpi_format);
+                        err = hpi_outstream_query_format(h_stream, &hpi_format);
                 if (!err && (hpi_to_alsa_formats[format] != -1))
-                        pcmhw->formats |=
-                                (1ULL << hpi_to_alsa_formats[format]);
+                        formats |= (1ULL << hpi_to_alsa_formats[format]);
         }
+        return formats;
 }
 
-static struct snd_pcm_hardware snd_card_asihpi_playback = {
-        .channels_min = 1,
-        .channels_max = 2,
-        .buffer_bytes_max = BUFFER_BYTES_MAX,
-        .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,
-        .periods_min = PERIODS_MIN,
-        .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
-        .fifo_size = 0,
-};
-
 static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm;
         struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);
+        struct snd_pcm_hardware snd_card_asihpi_playback;
         int err;
 
         dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
         if (dpcm == NULL)
                 return -ENOMEM;
 
-        err =
-            hpi_outstream_open(card->adapter_index,
+        err = hpi_outstream_open(card->hpi->adapter->index,
                               substream->number, &dpcm->h_stream);
         hpi_handle_error(err);
         if (err)
@@ -1012,12 +1005,19 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
         runtime->private_data = dpcm;
         runtime->private_free = snd_card_asihpi_runtime_free;
 
-        snd_card_asihpi_playback.channels_max = card->out_max_chans;
+        memset(&snd_card_asihpi_playback, 0, sizeof(snd_card_asihpi_playback));
+        snd_card_asihpi_playback.buffer_bytes_max = BUFFER_BYTES_MAX;
+        snd_card_asihpi_playback.period_bytes_min = PERIOD_BYTES_MIN;
         /*?snd_card_asihpi_playback.period_bytes_min =
         card->out_max_chans * 4096; */
-
-        snd_card_asihpi_playback_format(card, dpcm->h_stream,
-                                        &snd_card_asihpi_playback);
+        snd_card_asihpi_playback.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;
+        snd_card_asihpi_playback.periods_min = PERIODS_MIN;
+        snd_card_asihpi_playback.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN;
+        /* snd_card_asihpi_playback.fifo_size = 0; */
+        snd_card_asihpi_playback.channels_max = card->out_max_chans;
+        snd_card_asihpi_playback.channels_min = card->out_min_chans;
+        snd_card_asihpi_playback.formats =
+                        snd_card_asihpi_playback_formats(card, dpcm->h_stream);
 
         snd_card_asihpi_pcm_samplerates(card,  &snd_card_asihpi_playback);
 
@@ -1029,8 +1029,10 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
                                         SNDRV_PCM_INFO_MMAP |
                                         SNDRV_PCM_INFO_MMAP_VALID;
 
-        if (card->support_grouping)
+        if (card->support_grouping) {
                 snd_card_asihpi_playback.info |= SNDRV_PCM_INFO_SYNC_START;
+                snd_pcm_set_sync(substream);
+        }
 
         /* struct is copied, so can create initializer dynamically */
         runtime->hw = snd_card_asihpi_playback;
@@ -1047,8 +1049,6 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
         snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                 card->update_interval_frames * 2, UINT_MAX);
 
-        snd_pcm_set_sync(substream);
-
         snd_printdd("playback open\n");
 
         return 0;
@@ -1114,15 +1114,15 @@ static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)
 
 
 
-static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
-                                        u32 h_stream,
-                                         struct snd_pcm_hardware *pcmhw)
+static u64 snd_card_asihpi_capture_formats(struct snd_card_asihpi *asihpi,
+                                        u32 h_stream)
 {
   struct hpi_format hpi_format;
         u16 format;
         u16 err;
         u32 h_control;
         u32 sample_rate = 48000;
+        u64 formats = 0;
 
         /* on cards without SRC, must query at valid rate,
                 maybe set by external sync */
@@ -1137,34 +1137,22 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
                 format <= HPI_FORMAT_PCM24_SIGNED; format++) {
 
-                err = hpi_format_create(&hpi_format, 2, format,
-                                sample_rate, 128000, 0);
+                err = hpi_format_create(&hpi_format, asihpi->in_max_chans,
+                                        format, sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_instream_query_format(h_stream,
-                                            &hpi_format);
+                        err = hpi_instream_query_format(h_stream, &hpi_format);
                 if (!err)
-                        pcmhw->formats |=
-                                (1ULL << hpi_to_alsa_formats[format]);
+                        formats |= (1ULL << hpi_to_alsa_formats[format]);
         }
+        return formats;
 }
 
-
-static struct snd_pcm_hardware snd_card_asihpi_capture = {
-        .channels_min = 1,
-        .channels_max = 2,
-        .buffer_bytes_max = BUFFER_BYTES_MAX,
-        .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,
-        .periods_min = PERIODS_MIN,
-        .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
-        .fifo_size = 0,
-};
-
 static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);
         struct snd_card_asihpi_pcm *dpcm;
+        struct snd_pcm_hardware snd_card_asihpi_capture;
         int err;
 
         dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
@@ -1172,10 +1160,10 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
                 return -ENOMEM;
 
         snd_printdd("capture open adapter %d stream %d\n",
-                   card->adapter_index, substream->number);
+                        card->hpi->adapter->index, substream->number);
 
         err = hpi_handle_error(
-            hpi_instream_open(card->adapter_index,
+            hpi_instream_open(card->hpi->adapter->index,
                              substream->number, &dpcm->h_stream));
         if (err)
                 kfree(dpcm);
@@ -1184,7 +1172,6 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         if (err)
                 return -EIO;
 
-
         init_timer(&dpcm->timer);
         dpcm->timer.data = (unsigned long) dpcm;
         dpcm->timer.function = snd_card_asihpi_timer_function;
@@ -1192,9 +1179,17 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         runtime->private_data = dpcm;
         runtime->private_free = snd_card_asihpi_runtime_free;
 
+        memset(&snd_card_asihpi_capture, 0, sizeof(snd_card_asihpi_capture));
+        snd_card_asihpi_capture.buffer_bytes_max = BUFFER_BYTES_MAX;
+        snd_card_asihpi_capture.period_bytes_min = PERIOD_BYTES_MIN;
+        snd_card_asihpi_capture.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;
+        snd_card_asihpi_capture.periods_min = PERIODS_MIN;
+        snd_card_asihpi_capture.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN;
+        /* snd_card_asihpi_capture.fifo_size = 0; */
         snd_card_asihpi_capture.channels_max = card->in_max_chans;
-        snd_card_asihpi_capture_format(card, dpcm->h_stream,
-                                       &snd_card_asihpi_capture);
+        snd_card_asihpi_capture.channels_min = card->in_min_chans;
+        snd_card_asihpi_capture.formats =
+                snd_card_asihpi_capture_formats(card, dpcm->h_stream);
         snd_card_asihpi_pcm_samplerates(card,  &snd_card_asihpi_capture);
         snd_card_asihpi_capture.info = SNDRV_PCM_INFO_INTERLEAVED |
                                         SNDRV_PCM_INFO_MMAP |
@@ -1240,15 +1235,20 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {
         .pointer = snd_card_asihpi_capture_pointer,
 };
 
-static int __devinit snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi,
-                                      int device, int substreams)
+static int __devinit snd_card_asihpi_pcm_new(
+                struct snd_card_asihpi *asihpi, int device)
 {
         struct snd_pcm *pcm;
         int err;
+        u16 num_instreams, num_outstreams, x16;
+        u32 x32;
+
+        err = hpi_adapter_get_info(asihpi->hpi->adapter->index,
+                        &num_outstreams, &num_instreams,
+                        &x16, &x32, &x16);
 
         err = snd_pcm_new(asihpi->card, "Asihpi PCM", device,
-                         asihpi->num_outstreams, asihpi->num_instreams,
-                         &pcm);
+                        num_outstreams, num_instreams, &pcm);
         if (err < 0)
                 return err;
         /* pointer to ops struct is stored, dont change ops afterwards! */
@@ -1314,7 +1314,7 @@ static const char * const asihpi_src_names[] = {
         "Analog",
         "Adapter",
         "RTP",
-        "GPI",
+        "Internal"
 };
 
 compile_time_assert(
@@ -1332,7 +1332,6 @@ static const char * const asihpi_dst_names[] = {
         "Net",
         "Analog",
         "RTP",
-        "GPO",
 };
 
 compile_time_assert(
@@ -1410,6 +1409,7 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
 {
         u32 h_control = kcontrol->private_value;
+        u32 count;
         u16 err;
         /* native gains are in millibels */
         short min_gain_mB;
@@ -1424,8 +1424,12 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
                 step_gain_mB = VOL_STEP_mB;
         }
 
+        err = hpi_meter_query_channels(h_control, &count);
+        if (err)
+                count = HPI_MAX_CHANNELS;
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 2;
+        uinfo->count = count;
         uinfo->value.integer.min = min_gain_mB / VOL_STEP_mB;
         uinfo->value.integer.max = max_gain_mB / VOL_STEP_mB;
         uinfo->value.integer.step = step_gain_mB / VOL_STEP_mB;
@@ -2033,8 +2037,15 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
 static int snd_asihpi_meter_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
 {
+        u32 h_control = kcontrol->private_value;
+        u32 count;
+        u16 err;
+        err = hpi_meter_query_channels(h_control, &count);
+        if (err)
+                count = HPI_MAX_CHANNELS;
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = HPI_MAX_CHANNELS;
+        uinfo->count = count;
         uinfo->value.integer.min = 0;
         uinfo->value.integer.max = 0x7FFFFFFF;
         return 0;
@@ -2248,6 +2259,9 @@ static int snd_asihpi_cmode_info(struct snd_kcontrol *kcontrol,
                         valid_modes++;
                         }
 
+        if (!valid_modes)
+                return -EINVAL;
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = valid_modes;
@@ -2547,7 +2561,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
         strcpy(card->mixername, "Asihpi Mixer");
 
         err =
-            hpi_mixer_open(asihpi->adapter_index,
+            hpi_mixer_open(asihpi->hpi->adapter->index,
                           &asihpi->h_mixer);
         hpi_handle_error(err);
         if (err)
@@ -2665,24 +2679,33 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,
                         struct snd_info_buffer *buffer)
 {
         struct snd_card_asihpi *asihpi = entry->private_data;
-        u16 version;
         u32 h_control;
         u32 rate = 0;
         u16 source = 0;
+
+        u16 num_outstreams;
+        u16 num_instreams;
+        u16 version;
+        u32 serial_number;
+        u16 type;
+
         int err;
 
         snd_iprintf(buffer, "ASIHPI driver proc file\n");
+
+        hpi_handle_error(hpi_adapter_get_info(asihpi->hpi->adapter->index,
+                        &num_outstreams, &num_instreams,
+                        &version, &serial_number, &type));
+
         snd_iprintf(buffer,
-                "adapter ID=%4X\n_index=%d\n"
-                "num_outstreams=%d\n_num_instreams=%d\n",
-                asihpi->type, asihpi->adapter_index,
-                asihpi->num_outstreams, asihpi->num_instreams);
+                        "Adapter type ASI%4X\nHardware Index %d\n"
+                        "%d outstreams\n%d instreams\n",
+                        type, asihpi->hpi->adapter->index,
+                        num_outstreams, num_instreams);
 
-        version = asihpi->version;
         snd_iprintf(buffer,
-                "serial#=%d\n_hw version %c%d\nDSP code version %03d\n",
-                asihpi->serial_number, ((version >> 3) & 0xf) + 'A',
-                version & 0x7,
+                "Serial#%d\nHardware version %c%d\nDSP code version %03d\n",
+                serial_number, ((version >> 3) & 0xf) + 'A', version & 0x7,
                 ((version >> 13) * 100) + ((version >> 7) & 0x3f));
 
         err = hpi_mixer_get_control(asihpi->h_mixer,
@@ -2690,18 +2713,15 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err) {
-                err = hpi_sample_clock_get_sample_rate(
-                                        h_control, &rate);
+                err = hpi_sample_clock_get_sample_rate(h_control, &rate);
                 err += hpi_sample_clock_get_source(h_control, &source);
 
                 if (!err)
-                        snd_iprintf(buffer, "sample_clock=%d_hz, source %s\n",
+                        snd_iprintf(buffer, "Sample Clock %dHz, source %s\n",
                         rate, sampleclock_sources[source]);
         }
-
 }
 
-
 static void __devinit snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)
 {
         struct snd_info_entry *entry;
@@ -2773,35 +2793,34 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                                        const struct pci_device_id *pci_id)
 {
         int err;
-
-        u16 version;
-        int pcm_substreams;
-
-        struct hpi_adapter *hpi_card;
+        struct hpi_adapter *hpi;
         struct snd_card *card;
         struct snd_card_asihpi *asihpi;
 
         u32 h_control;
         u32 h_stream;
+        u32 adapter_index;
 
         static int dev;
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
 
-        /* Should this be enable[hpi_card->index] ? */
+        /* Should this be enable[hpi->index] ? */
         if (!enable[dev]) {
                 dev++;
                 return -ENOENT;
         }
 
+        /* Initialise low-level HPI driver */
         err = asihpi_adapter_probe(pci_dev, pci_id);
         if (err < 0)
                 return err;
 
-        hpi_card = pci_get_drvdata(pci_dev);
+        hpi = pci_get_drvdata(pci_dev);
+        adapter_index = hpi->adapter->index;
         /* first try to give the card the same index as its hardware index */
-        err = snd_card_create(hpi_card->index,
-                              id[hpi_card->index], THIS_MODULE,
+        err = snd_card_create(adapter_index,
+                              id[adapter_index], THIS_MODULE,
                               sizeof(struct snd_card_asihpi),
                               &card);
         if (err < 0) {
@@ -2815,50 +2834,32 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                         return err;
                 snd_printk(KERN_WARNING
                         "**** WARNING **** Adapter index %d->ALSA index %d\n",
-                        hpi_card->index, card->number);
+                        adapter_index, card->number);
         }
 
         snd_card_set_dev(card, &pci_dev->dev);
 
-        asihpi = (struct snd_card_asihpi *) card->private_data;
+        asihpi = card->private_data;
         asihpi->card = card;
         asihpi->pci = pci_dev;
-        asihpi->adapter_index = hpi_card->index;
-        hpi_handle_error(hpi_adapter_get_info(
-                                 asihpi->adapter_index,
-                                 &asihpi->num_outstreams,
-                                 &asihpi->num_instreams,
-                                 &asihpi->version,
-                                 &asihpi->serial_number, &asihpi->type));
-
-        version = asihpi->version;
-        snd_printk(KERN_INFO "adapter ID=%4X index=%d num_outstreams=%d "
-                        "num_instreams=%d S/N=%d\n"
-                        "Hw Version %c%d DSP code version %03d\n",
-                        asihpi->type, asihpi->adapter_index,
-                        asihpi->num_outstreams,
-                        asihpi->num_instreams, asihpi->serial_number,
-                        ((version >> 3) & 0xf) + 'A',
-                        version & 0x7,
-                        ((version >> 13) * 100) + ((version >> 7) & 0x3f));
-
-        pcm_substreams = asihpi->num_outstreams;
-        if (pcm_substreams < asihpi->num_instreams)
-                pcm_substreams = asihpi->num_instreams;
-
-        err = hpi_adapter_get_property(asihpi->adapter_index,
+        asihpi->hpi = hpi;
+
+        snd_printk(KERN_INFO "adapter ID=%4X index=%d\n",
+                        asihpi->hpi->adapter->type, adapter_index);
+
+        err = hpi_adapter_get_property(adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS1,
                 NULL, &asihpi->support_grouping);
         if (err)
                 asihpi->support_grouping = 0;
 
-        err = hpi_adapter_get_property(asihpi->adapter_index,
+        err = hpi_adapter_get_property(adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS2,
                 &asihpi->support_mrx, NULL);
         if (err)
                 asihpi->support_mrx = 0;
 
-        err = hpi_adapter_get_property(asihpi->adapter_index,
+        err = hpi_adapter_get_property(adapter_index,
                 HPI_ADAPTER_PROPERTY_INTERVAL,
                 NULL, &asihpi->update_interval_frames);
         if (err)
@@ -2867,7 +2868,7 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
         if (!asihpi->can_dma)
                 asihpi->update_interval_frames *= 2;
 
-        hpi_handle_error(hpi_instream_open(asihpi->adapter_index,
+        hpi_handle_error(hpi_instream_open(adapter_index,
                              0, &h_stream));
 
         err = hpi_instream_host_buffer_free(h_stream);
@@ -2875,7 +2876,7 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
 
         hpi_handle_error(hpi_instream_close(h_stream));
 
-        err = hpi_adapter_get_property(asihpi->adapter_index,
+        err = hpi_adapter_get_property(adapter_index,
                 HPI_ADAPTER_PROPERTY_CURCHANNELS,
                 &asihpi->in_max_chans, &asihpi->out_max_chans);
         if (err) {
@@ -2883,13 +2884,22 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 asihpi->out_max_chans = 2;
         }
 
-        snd_printk(KERN_INFO "has dma:%d, grouping:%d, mrx:%d\n",
+        if (asihpi->out_max_chans > 2) { /* assume LL mode */
+                asihpi->out_min_chans = asihpi->out_max_chans;
+                asihpi->in_min_chans = asihpi->in_max_chans;
+                asihpi->support_grouping = 0;
+        } else {
+                asihpi->out_min_chans = 1;
+                asihpi->in_min_chans = 1;
+        }
+
+        snd_printk(KERN_INFO "Has dma:%d, grouping:%d, mrx:%d\n",
                         asihpi->can_dma,
                         asihpi->support_grouping,
                         asihpi->support_mrx
               );
 
-        err = snd_card_asihpi_pcm_new(asihpi, 0, pcm_substreams);
+        err = snd_card_asihpi_pcm_new(asihpi, 0);
         if (err < 0) {
                 snd_printk(KERN_ERR "pcm_new failed\n");
                 goto __nodev;
@@ -2916,13 +2926,14 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
 
         strcpy(card->driver, "ASIHPI");
 
-        sprintf(card->shortname, "AudioScience ASI%4X", asihpi->type);
+        sprintf(card->shortname, "AudioScience ASI%4X",
+                        asihpi->hpi->adapter->type);
         sprintf(card->longname, "%s %i",
-                        card->shortname, asihpi->adapter_index);
+                        card->shortname, adapter_index);
         err = snd_card_register(card);
 
         if (!err) {
-                hpi_card->snd_card_asihpi = card;
+                hpi->snd_card = card;
                 dev++;
                 return 0;
         }
@@ -2935,10 +2946,9 @@ __nodev:
 
 static void __devexit snd_asihpi_remove(struct pci_dev *pci_dev)
 {
-        struct hpi_adapter *hpi_card = pci_get_drvdata(pci_dev);
-
-        snd_card_free(hpi_card->snd_card_asihpi);
-        hpi_card->snd_card_asihpi = NULL;
+        struct hpi_adapter *hpi = pci_get_drvdata(pci_dev);
+        snd_card_free(hpi->snd_card);
+        hpi->snd_card = NULL;
         asihpi_adapter_remove(pci_dev);
 }
 
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index f20727288994..20887241a3ae 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -30,26 +30,8 @@
 
 #ifndef _HPI_H_
 #define _HPI_H_
-/* HPI Version
-If HPI_VER_MINOR is odd then its a development release not intended for the
-public. If HPI_VER_MINOR is even then is a release version
-i.e 3.05.02 is a development version
-*/
-#define HPI_VERSION_CONSTRUCTOR(maj, min, rel) \
-        ((maj << 16) + (min << 8) + rel)
-
-#define HPI_VER_MAJOR(v) ((int)(v >> 16))
-#define HPI_VER_MINOR(v) ((int)((v >> 8) & 0xFF))
-#define HPI_VER_RELEASE(v) ((int)(v & 0xFF))
-
-#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 8, 0)
-#define HPI_VER_STRING "4.08.00"
-
-/* Library version as documented in hpi-api-versions.txt */
-#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(10, 0, 0)
 
 #include <linux/types.h>
-#define HPI_BUILD_EXCLUDE_DEPRECATED
 #define HPI_BUILD_KERNEL_MODE
 
 /******************************************************************************/
@@ -213,7 +195,7 @@ enum HPI_SOURCENODES {
         /** RTP stream input node - This node is a destination for
             packets of RTP audio samples from other devices. */
         HPI_SOURCENODE_RTP_DESTINATION = 112,
-        HPI_SOURCENODE_GP_IN = 113,          /**< general purpose input. */
+        HPI_SOURCENODE_INTERNAL = 113,       /**< node internal to the device. */
         /* !!!Update this  AND hpidebug.h if you add a new sourcenode type!!! */
         HPI_SOURCENODE_LAST_INDEX = 113      /**< largest ID */
                 /* AX6 max sourcenode types = 15 */
@@ -242,9 +224,8 @@ enum HPI_DESTNODES {
         /** RTP stream output node - This node is a source for
             packets of RTP audio samples that are sent to other devices. */
         HPI_DESTNODE_RTP_SOURCE = 208,
-        HPI_DESTNODE_GP_OUT = 209,           /**< general purpose output node. */
         /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */
-        HPI_DESTNODE_LAST_INDEX = 209        /**< largest ID */
+        HPI_DESTNODE_LAST_INDEX = 208        /**< largest ID */
                 /* AX6 max destnode types = 15 */
 };
 
@@ -450,7 +431,19 @@ Indicates that the adapter in it's current mode supports interrupts
 across the host bus. Note, this does not imply that interrupts are
 enabled. Instead it indicates that they can be enabled.
 */
-        HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ = 272
+        HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ = 272,
+/** Readonly supports firmware updating.
+Indicates that the adapter implements an interface to update firmware
+on the adapter.
+*/
+        HPI_ADAPTER_PROPERTY_SUPPORTS_FW_UPDATE = 273,
+/** Readonly Firmware IDs
+Identifiy firmware independent of individual adapter type.
+May be used as a filter for firmware update images.
+Property 1 = Bootloader ID
+Property 2 = Main program ID
+*/
+        HPI_ADAPTER_PROPERTY_FIRMWARE_ID = 274
 };
 
 /** Adapter mode commands
@@ -638,7 +631,7 @@ enum HPI_MIXER_STORE_COMMAND {
         HPI_MIXER_STORE_ENABLE = 4,
 /** Disable auto storage of some control settings. */
         HPI_MIXER_STORE_DISABLE = 5,
-/** Save the attributes of a single control. */
+/** Unimplemented - save the attributes of a single control. */
         HPI_MIXER_STORE_SAVE_SINGLE = 6
 };
 
@@ -941,7 +934,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_BAD_ADAPTER_NUMBER = 202,
         /** 2 adapters with the same adapter number. */
         HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,
-        /** DSP code failed to bootload. (unused?) */
+        /** DSP code failed to bootload. Usually a DSP memory test failure. */
         HPI_ERROR_DSP_BOOTLOAD = 204,
         /** Couldn't find or open the DSP code file. */
         HPI_ERROR_DSP_FILE_NOT_FOUND = 206,
@@ -978,6 +971,9 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_FLASH_VERIFY = 225,
         HPI_ERROR_FLASH_TYPE = 226,
         HPI_ERROR_FLASH_START = 227,
+        HPI_ERROR_FLASH_READ = 228,
+        HPI_ERROR_FLASH_READ_NO_FILE = 229,
+        HPI_ERROR_FLASH_SIZE = 230,
 
         /** Reserved for OEMs. */
         HPI_ERROR_RESERVED_1 = 290,
@@ -1020,6 +1016,8 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_NO_INTERDSP_GROUPS = 315,
         /** Stream wait cancelled before threshold reached. */
         HPI_ERROR_WAIT_CANCELLED = 316,
+        /** A character string is invalid. */
+        HPI_ERROR_INVALID_STRING = 317,
 
         /** Invalid mixer node for this adapter. */
         HPI_ERROR_INVALID_NODE = 400,
@@ -1046,11 +1044,15 @@ enum HPI_ERROR_CODES {
         /** I2C */
         HPI_ERROR_I2C_BAD_ADR = 460,
 
-        /** Entity errors */
+        /** Entity type did not match requested type */
         HPI_ERROR_ENTITY_TYPE_MISMATCH = 470,
+        /** Entity item count did not match requested count */
         HPI_ERROR_ENTITY_ITEM_COUNT = 471,
+        /** Entity type is not one of the valid types */
         HPI_ERROR_ENTITY_TYPE_INVALID = 472,
+        /** Entity role is not one of the valid roles */
         HPI_ERROR_ENTITY_ROLE_INVALID = 473,
+        /** Entity size doesn't match target size */
         HPI_ERROR_ENTITY_SIZE_MISMATCH = 474,
 
         /* AES18 specific errors were 500..507 */
@@ -1078,8 +1080,7 @@ enum HPI_ERROR_CODES {
 /** \defgroup maximums HPI maximum values
 \{
 */
-/** Maximum number of adapters per HPI sub-system
-   WARNING: modifying this value changes the response structure size.*/
+/** Maximum number of PCI HPI adapters */
 #define HPI_MAX_ADAPTERS                20
 /** Maximum number of in or out streams per adapter */
 #define HPI_MAX_STREAMS                 16
@@ -1090,6 +1091,9 @@ enum HPI_ERROR_CODES {
 #define HPI_MAX_ANC_BYTES_PER_FRAME     (64)
 #define HPI_STRING_LEN                  16
 
+/** Networked adapters have index >= 100 */
+#define HPI_MIN_NETWORK_ADAPTER_IDX 100
+
 /** Velocity units */
 #define HPI_OSTREAM_VELOCITY_UNITS      4096
 /** OutStream timescale units */
@@ -1111,14 +1115,14 @@ enum HPI_ERROR_CODES {
 struct hpi_format {
         u32 sample_rate;
                                 /**< 11025, 32000, 44100 ... */
-        u32 bit_rate;         /**< for MPEG */
+        u32 bit_rate;             /**< for MPEG */
         u32 attributes;
                                 /**< Stereo/JointStereo/Mono */
         u16 mode_legacy;
                                 /**< Legacy ancillary mode or idle bit  */
-        u16 unused;           /**< Unused */
-        u16 channels; /**< 1,2..., (or ancillary mode or idle bit */
-        u16 format;   /**< HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */
+        u16 unused;               /**< Unused */
+        u16 channels;     /**< 1,2..., (or ancillary mode or idle bit */
+        u16 format;       /**< HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */
 };
 
 struct hpi_anc_frame {
@@ -1144,9 +1148,6 @@ struct hpi_async_event {
         } u;
 };
 
-/* skip host side function declarations for
-   DSP compile and documentation extraction */
-
 #ifndef DISABLE_PRAGMA_PACK1
 #pragma pack(pop)
 #endif
@@ -1357,7 +1358,7 @@ u16 hpi_volume_get_mute(u32 h_control, u32 *mute);
 u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,
         short *max_gain_01dB, short *step_gain_01dB);
 
-u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels);
+u16 hpi_volume_query_channels(const u32 h_control, u32 *p_channels);
 
 u16 hpi_volume_auto_fade(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms);
@@ -1366,6 +1367,9 @@ u16 hpi_volume_auto_fade_profile(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,
         u16 profile);
 
+u16 hpi_volume_query_auto_fade_profile(const u32 h_control, const u32 i,
+        u16 *profile);
+
 /*****************/
 /* Level control */
 /*****************/
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 3cc6f11c20aa..2414d7a2239d 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -231,6 +231,8 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 static void control_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
+        struct hpi_hw_obj *phw = pao->priv;
+
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
@@ -248,17 +250,14 @@ static void control_message(struct hpi_adapter_obj *pao,
                                 break;
                         }
 
-                        if (hpi_check_control_cache(((struct hpi_hw_obj *)
-                                                pao->priv)->p_cache, phm,
-                                        phr))
+                        if (hpi_check_control_cache(phw->p_cache, phm, phr))
                                 break;
                 }
                 hw_message(pao, phm, phr);
                 break;
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
-                hpi_cmn_control_cache_sync_to_msg(((struct hpi_hw_obj *)pao->
-                                priv)->p_cache, phm, phr);
+                hpi_cmn_control_cache_sync_to_msg(phw->p_cache, phm, phr);
                 break;
 
         case HPI_CONTROL_GET_INFO:
@@ -451,11 +450,11 @@ static void subsys_create_adapter(struct hpi_message *phm,
         }
 
         for (dsp_index = 0; dsp_index < MAX_DSPS; dsp_index++) {
-                struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+                struct hpi_hw_obj *phw = pao->priv;
                 phw->ado[dsp_index].pa_parent_adapter = pao;
         }
 
-        phr->u.s.adapter_type = ao.adapter_type;
+        phr->u.s.adapter_type = ao.type;
         phr->u.s.adapter_index = ao.index;
         phr->error = 0;
 }
@@ -476,7 +475,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 dsp_index = 0;
         u32 control_cache_size = 0;
         u32 control_cache_count = 0;
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         /* The PCI2040 has the following address map */
         /* BAR0 - 4K = HPI control and status registers on PCI2040 (HPI CSR) */
@@ -559,7 +558,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                         if (error)
                                 return error;
                 }
-                pao->adapter_type = hr0.u.ax.info.adapter_type;
+                pao->type = hr0.u.ax.info.adapter_type;
                 pao->index = hr0.u.ax.info.adapter_index;
         }
 
@@ -584,9 +583,8 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                         pao->has_control_cache = 1;
         }
 
-        HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n",
-                pao->adapter_type, pao->index);
-        pao->open = 0;  /* upon creation the adapter is closed */
+        HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n", pao->type,
+                pao->index);
 
         if (phw->p_cache)
                 phw->p_cache->adap_idx = pao->index;
@@ -596,7 +594,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
 
 static void delete_adapter_obj(struct hpi_adapter_obj *pao)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         if (pao->has_control_cache)
                 hpi_free_control_cache(phw->p_cache);
@@ -639,7 +637,7 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         u32 *pos_error_code)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         short error;
         u32 timeout;
         u32 read = 0;
@@ -1220,8 +1218,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,
 static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 hpi_address, u32 *source, u32 count)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 time_out = PCI_TIMEOUT;
         int c6711_burst_size = 128;
         u32 local_hpi_address = hpi_address;
@@ -1258,8 +1256,8 @@ static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,
 static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 hpi_address, u32 *dest, u32 count)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 time_out = PCI_TIMEOUT;
         int c6711_burst_size = 16;
         u32 local_hpi_address = hpi_address;
@@ -1298,7 +1296,7 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,
 static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         u16 dsp_index, struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout;
         u16 ack;
@@ -1414,8 +1412,8 @@ static short hpi6000_send_data_check_adr(u32 address, u32 length_in_dwords)
 static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 data_sent = 0;
         u16 ack;
         u32 length, address;
@@ -1487,8 +1485,8 @@ static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,
 static short hpi6000_get_data(struct hpi_adapter_obj *pao, u16 dsp_index,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 data_got = 0;
         u16 ack;
         u32 length, address;
@@ -1551,8 +1549,8 @@ static void hpi6000_send_dsp_interrupt(struct dsp_obj *pdo)
 static short hpi6000_send_host_command(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 host_cmd)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout = TIMEOUT;
 
         /* set command */
@@ -1577,7 +1575,7 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,
 {
         u32 hPI_error;
 
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         /* read the error bits from the PCI2040 */
         hPI_error = ioread32(phw->dw2040_HPICSR + HPI_ERROR_REPORT);
@@ -1597,8 +1595,8 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,
 static short hpi6000_wait_dsp_ack(struct hpi_adapter_obj *pao, u16 dsp_index,
         u32 ack_value)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 ack = 0L;
         u32 timeout;
         u32 hPIC = 0L;
@@ -1640,7 +1638,7 @@ static short hpi6000_update_control_cache(struct hpi_adapter_obj *pao,
         struct hpi_message *phm)
 {
         const u16 dsp_index = 0;
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout;
         u32 cache_dirty_flag;
@@ -1740,7 +1738,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
 {
         u16 error = 0;
         u16 dsp_index = 0;
-        u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp;
+        struct hpi_hw_obj *phw = pao->priv;
+        u16 num_dsp = phw->num_dsp;
 
         if (num_dsp < 2)
                 dsp_index = 0;
diff --git a/sound/pci/asihpi/hpi6000.h b/sound/pci/asihpi/hpi6000.h
index 4c7d507c0ecd..7e0deeff5e7c 100644
--- a/sound/pci/asihpi/hpi6000.h
+++ b/sound/pci/asihpi/hpi6000.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index e041a6ae1c5a..4f2873880b16 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -45,18 +45,21 @@
 #define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016
 
 /* initialization/bootload errors */
-#define HPI6205_ERROR_6205_NO_IRQ               1002
-#define HPI6205_ERROR_6205_INIT_FAILED          1003
-#define HPI6205_ERROR_6205_REG                  1006
-#define HPI6205_ERROR_6205_DSPPAGE              1007
-#define HPI6205_ERROR_C6713_HPIC                1009
-#define HPI6205_ERROR_C6713_HPIA                1010
-#define HPI6205_ERROR_C6713_PLL                 1011
-#define HPI6205_ERROR_DSP_INTMEM                1012
-#define HPI6205_ERROR_DSP_EXTMEM                1013
-#define HPI6205_ERROR_DSP_PLD                   1014
-#define HPI6205_ERROR_6205_EEPROM               1017
-#define HPI6205_ERROR_DSP_EMIF                  1018
+#define HPI6205_ERROR_6205_NO_IRQ       1002
+#define HPI6205_ERROR_6205_INIT_FAILED  1003
+#define HPI6205_ERROR_6205_REG          1006
+#define HPI6205_ERROR_6205_DSPPAGE      1007
+#define HPI6205_ERROR_C6713_HPIC        1009
+#define HPI6205_ERROR_C6713_HPIA        1010
+#define HPI6205_ERROR_C6713_PLL         1011
+#define HPI6205_ERROR_DSP_INTMEM        1012
+#define HPI6205_ERROR_DSP_EXTMEM        1013
+#define HPI6205_ERROR_DSP_PLD           1014
+#define HPI6205_ERROR_6205_EEPROM       1017
+#define HPI6205_ERROR_DSP_EMIF1         1018
+#define HPI6205_ERROR_DSP_EMIF2         1019
+#define HPI6205_ERROR_DSP_EMIF3         1020
+#define HPI6205_ERROR_DSP_EMIF4         1021
 
 /*****************************************************************************/
 /* for C6205 PCI i/f */
@@ -488,7 +491,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
                 return;
         }
 
-        phr->u.s.adapter_type = ao.adapter_type;
+        phr->u.s.adapter_type = ao.type;
         phr->u.s.adapter_index = ao.index;
         phr->error = 0;
 }
@@ -503,7 +506,7 @@ static void adapter_delete(struct hpi_adapter_obj *pao,
                 phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 return;
         }
-        phw = (struct hpi_hw_obj *)pao->priv;
+        phw = pao->priv;
         /* reset adapter h/w */
         /* Reset C6713 #1 */
         boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 0);
@@ -652,7 +655,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                 if (hr.error)
                         return hr.error;
 
-                pao->adapter_type = hr.u.ax.info.adapter_type;
+                pao->type = hr.u.ax.info.adapter_type;
                 pao->index = hr.u.ax.info.adapter_index;
 
                 max_streams =
@@ -665,8 +668,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                         hr.u.ax.info.serial_number);
         }
 
-        pao->open = 0;  /* upon creation the adapter is closed */
-
         if (phw->p_cache)
                 phw->p_cache->adap_idx = pao->index;
 
@@ -803,8 +804,8 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                         obj_index];
                 status->samples_processed = 0;
                 status->stream_state = HPI_STATE_STOPPED;
-                status->dSP_index = 0;
-                status->host_index = status->dSP_index;
+                status->dsp_index = 0;
+                status->host_index = status->dsp_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
                 status->auxiliary_data_available = 0;
 
@@ -878,7 +879,7 @@ static void outstream_host_buffer_free(struct hpi_adapter_obj *pao,
 static u32 outstream_get_space_available(struct hpi_hostbuffer_status *status)
 {
         return status->size_in_bytes - (status->host_index -
-                status->dSP_index);
+                status->dsp_index);
 }
 
 static void outstream_write(struct hpi_adapter_obj *pao,
@@ -1080,8 +1081,8 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                         obj_index];
                 status->samples_processed = 0;
                 status->stream_state = HPI_STATE_STOPPED;
-                status->dSP_index = 0;
-                status->host_index = status->dSP_index;
+                status->dsp_index = 0;
+                status->host_index = status->dsp_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
                 status->auxiliary_data_available = 0;
 
@@ -1162,7 +1163,7 @@ static void instream_start(struct hpi_adapter_obj *pao,
 
 static u32 instream_get_bytes_available(struct hpi_hostbuffer_status *status)
 {
-        return status->dSP_index - status->host_index;
+        return status->dsp_index - status->host_index;
 }
 
 static void instream_read(struct hpi_adapter_obj *pao,
@@ -1614,7 +1615,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800008, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800008))
-                        return HPI6205_ERROR_DSP_EMIF;
+                        return HPI6205_ERROR_DSP_EMIF1;
 
                 /* EMIF CE1 setup - 32 bit async. This is 6713 #1 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1627,7 +1628,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800004, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800004))
-                        return HPI6205_ERROR_DSP_EMIF;
+                        return HPI6205_ERROR_DSP_EMIF2;
 
                 /* EMIF CE2 setup - 32 bit async. This is 6713 #2 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1639,7 +1640,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800010, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800010))
-                        return HPI6205_ERROR_DSP_EMIF;
+                        return HPI6205_ERROR_DSP_EMIF3;
 
                 /* EMIF CE3 setup - 32 bit async. */
                 /* This is the PLD on the ASI5000 cards only */
@@ -1650,7 +1651,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800014, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800014))
-                        return HPI6205_ERROR_DSP_EMIF;
+                        return HPI6205_ERROR_DSP_EMIF4;
 
                 /* set EMIF SDRAM control for 2Mx32 SDRAM (512x32x4 bank) */
                 /*  need to use this else DSP code crashes? */
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index d497030c160f..4cc315daeda0 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -25,6 +25,7 @@ HPI internal definitions
 #define _HPI_INTERNAL_H_
 
 #include "hpi.h"
+
 /** maximum number of memory regions mapped to an adapter */
 #define HPI_MAX_ADAPTER_MEM_SPACES (2)
 
@@ -220,8 +221,6 @@ enum HPI_CONTROL_ATTRIBUTES {
 
         HPI_COBRANET_SET = HPI_CTL_ATTR(COBRANET, 1),
         HPI_COBRANET_GET = HPI_CTL_ATTR(COBRANET, 2),
-        /*HPI_COBRANET_SET_DATA         = HPI_CTL_ATTR(COBRANET, 3), */
-        /*HPI_COBRANET_GET_DATA         = HPI_CTL_ATTR(COBRANET, 4), */
         HPI_COBRANET_GET_STATUS = HPI_CTL_ATTR(COBRANET, 5),
         HPI_COBRANET_SEND_PACKET = HPI_CTL_ATTR(COBRANET, 6),
         HPI_COBRANET_GET_PACKET = HPI_CTL_ATTR(COBRANET, 7),
@@ -241,7 +240,9 @@ enum HPI_CONTROL_ATTRIBUTES {
         HPI_PAD_PROGRAM_TYPE = HPI_CTL_ATTR(PAD, 5),
         HPI_PAD_PROGRAM_ID = HPI_CTL_ATTR(PAD, 6),
         HPI_PAD_TA_SUPPORT = HPI_CTL_ATTR(PAD, 7),
-        HPI_PAD_TA_ACTIVE = HPI_CTL_ATTR(PAD, 8)
+        HPI_PAD_TA_ACTIVE = HPI_CTL_ATTR(PAD, 8),
+
+        HPI_UNIVERSAL_ENTITY = HPI_CTL_ATTR(UNIVERSAL, 1)
 };
 
 #define HPI_POLARITY_POSITIVE           0
@@ -393,14 +394,10 @@ enum HPI_FUNCTION_IDS {
         HPI_SUBSYS_OPEN = HPI_FUNC_ID(SUBSYSTEM, 1),
         HPI_SUBSYS_GET_VERSION = HPI_FUNC_ID(SUBSYSTEM, 2),
         HPI_SUBSYS_GET_INFO = HPI_FUNC_ID(SUBSYSTEM, 3),
-        /* HPI_SUBSYS_FIND_ADAPTERS     = HPI_FUNC_ID(SUBSYSTEM, 4), */
         HPI_SUBSYS_CREATE_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 5),
         HPI_SUBSYS_CLOSE = HPI_FUNC_ID(SUBSYSTEM, 6),
-        /* HPI_SUBSYS_DELETE_ADAPTER    = HPI_FUNC_ID(SUBSYSTEM, 7), */
         HPI_SUBSYS_DRIVER_LOAD = HPI_FUNC_ID(SUBSYSTEM, 8),
         HPI_SUBSYS_DRIVER_UNLOAD = HPI_FUNC_ID(SUBSYSTEM, 9),
-        /* HPI_SUBSYS_READ_PORT_8               = HPI_FUNC_ID(SUBSYSTEM, 10), */
-        /* HPI_SUBSYS_WRITE_PORT_8              = HPI_FUNC_ID(SUBSYSTEM, 11), */
         HPI_SUBSYS_GET_NUM_ADAPTERS = HPI_FUNC_ID(SUBSYSTEM, 12),
         HPI_SUBSYS_GET_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 13),
         HPI_SUBSYS_SET_NETWORK_INTERFACE = HPI_FUNC_ID(SUBSYSTEM, 14),
@@ -430,7 +427,10 @@ enum HPI_FUNCTION_IDS {
         HPI_ADAPTER_IRQ_QUERY_AND_CLEAR = HPI_FUNC_ID(ADAPTER, 19),
         HPI_ADAPTER_IRQ_CALLBACK = HPI_FUNC_ID(ADAPTER, 20),
         HPI_ADAPTER_DELETE = HPI_FUNC_ID(ADAPTER, 21),
-#define HPI_ADAPTER_FUNCTION_COUNT 21
+        HPI_ADAPTER_READ_FLASH = HPI_FUNC_ID(ADAPTER, 22),
+        HPI_ADAPTER_END_FLASH = HPI_FUNC_ID(ADAPTER, 23),
+        HPI_ADAPTER_FILESTORE_DELETE_ALL = HPI_FUNC_ID(ADAPTER, 24),
+#define HPI_ADAPTER_FUNCTION_COUNT 24
 
         HPI_OSTREAM_OPEN = HPI_FUNC_ID(OSTREAM, 1),
         HPI_OSTREAM_CLOSE = HPI_FUNC_ID(OSTREAM, 2),
@@ -495,7 +495,9 @@ enum HPI_FUNCTION_IDS {
         HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES = HPI_FUNC_ID(MIXER, 10),
         HPI_MIXER_STORE = HPI_FUNC_ID(MIXER, 11),
         HPI_MIXER_GET_CACHE_INFO = HPI_FUNC_ID(MIXER, 12),
-#define HPI_MIXER_FUNCTION_COUNT 12
+        HPI_MIXER_GET_BLOCK_HANDLE = HPI_FUNC_ID(MIXER, 13),
+        HPI_MIXER_GET_PARAMETER_HANDLE = HPI_FUNC_ID(MIXER, 14),
+#define HPI_MIXER_FUNCTION_COUNT 14
 
         HPI_CONTROL_GET_INFO = HPI_FUNC_ID(CONTROL, 1),
         HPI_CONTROL_GET_STATE = HPI_FUNC_ID(CONTROL, 2),
@@ -618,7 +620,7 @@ struct hpi_hostbuffer_status {
         u32 auxiliary_data_available;
         u32 stream_state;
         /* DSP index in to the host bus master buffer. */
-        u32 dSP_index;
+        u32 dsp_index;
         /* Host index in to the host bus master buffer. */
         u32 host_index;
         u32 size_in_bytes;
@@ -661,13 +663,6 @@ union hpi_adapterx_msg {
                 u16 index;
         } module_info;
         struct {
-                u32 checksum;
-                u16 sequence;
-                u16 length;
-                u16 offset; /**< offset from start of msg to data */
-                u16 unused;
-        } program_flash;
-        struct {
                 u16 index;
                 u16 what;
                 u16 property_index;
@@ -678,25 +673,18 @@ union hpi_adapterx_msg {
                 u16 parameter2;
         } property_set;
         struct {
-                u32 offset;
-        } query_flash;
-        struct {
                 u32 pad32;
                 u16 key1;
                 u16 key2;
         } restart;
         struct {
-                u32 offset;
-                u32 length;
-                u32 key;
-        } start_flash;
-        struct {
                 u32 pad32;
                 u16 value;
         } test_assert;
         struct {
                 u32 yes;
         } irq_query;
+        u32 pad[3];
 };
 
 struct hpi_adapter_res {
@@ -724,18 +712,10 @@ union hpi_adapterx_res {
                 u32 adapter_mode;
         } mode;
         struct {
-                u16 sequence;
-        } program_flash;
-        struct {
                 u16 parameter1;
                 u16 parameter2;
         } property_get;
         struct {
-                u32 checksum;
-                u32 length;
-                u32 version;
-        } query_flash;
-        struct {
                 u32 yes;
         } irq_query;
 };
@@ -1150,74 +1130,9 @@ struct hpi_res_adapter_get_info {
         struct hpi_adapter_res p;
 };
 
-/* padding is so these are same size as v0 hpi_message */
-struct hpi_msg_adapter_query_flash {
-        struct hpi_message_header h;
-        u32 offset;
-        u8 pad_to_version0_size[sizeof(struct hpi_message) -    /* V0 res */
-                sizeof(struct hpi_message_header) - 1 * sizeof(u32)];
-};
-
-/* padding is so these are same size as v0 hpi_response */
-struct hpi_res_adapter_query_flash {
-        struct hpi_response_header h;
-        u32 checksum;
-        u32 length;
-        u32 version;
-        u8 pad_to_version0_size[sizeof(struct hpi_response) -   /* V0 res */
-                sizeof(struct hpi_response_header) - 3 * sizeof(u32)];
-};
-
-struct hpi_msg_adapter_start_flash {
-        struct hpi_message_header h;
-        u32 offset;
-        u32 length;
-        u32 key;
-        u8 pad_to_version0_size[sizeof(struct hpi_message) -    /* V0 res */
-                sizeof(struct hpi_message_header) - 3 * sizeof(u32)];
-};
-
-struct hpi_res_adapter_start_flash {
-        struct hpi_response_header h;
-        u8 pad_to_version0_size[sizeof(struct hpi_response) -   /* V0 res */
-                sizeof(struct hpi_response_header)];
-};
-
-struct hpi_msg_adapter_program_flash_payload {
-        u32 checksum;
-        u16 sequence;
-        u16 length;
-        u16 offset; /**< offset from start of msg to data */
-        u16 unused;
-        /* ensure sizeof(header + payload) == sizeof(hpi_message_V0)
-           because old firmware expects data after message of this size */
-        u8 pad_to_version0_size[sizeof(struct hpi_message) -    /* V0 message */
-                sizeof(struct hpi_message_header) - sizeof(u32) -
-                4 * sizeof(u16)];
-};
-
-struct hpi_msg_adapter_program_flash {
-        struct hpi_message_header h;
-        struct hpi_msg_adapter_program_flash_payload p;
-        u32 data[256];
-};
-
-struct hpi_res_adapter_program_flash {
-        struct hpi_response_header h;
-        u16 sequence;
-        u8 pad_to_version0_size[sizeof(struct hpi_response) -   /* V0 res */
-                sizeof(struct hpi_response_header) - sizeof(u16)];
-};
-
-struct hpi_msg_adapter_debug_read {
-        struct hpi_message_header h;
-        u32 dsp_address;
-        u32 count_bytes;
-};
-
 struct hpi_res_adapter_debug_read {
         struct hpi_response_header h;
-        u8 bytes[256];
+        u8 bytes[1024];
 };
 
 struct hpi_msg_cobranet_hmi {
@@ -1461,7 +1376,7 @@ struct hpi_control_cache_pad {
 /* 2^N sized FIFO buffer (internal to HPI<->DSP interaction) */
 struct hpi_fifo_buffer {
         u32 size;
-        u32 dSP_index;
+        u32 dsp_index;
         u32 host_index;
 };
 
diff --git a/sound/pci/asihpi/hpi_version.h b/sound/pci/asihpi/hpi_version.h
new file mode 100644
index 000000000000..e9146e53bd50
--- /dev/null
+++ b/sound/pci/asihpi/hpi_version.h
@@ -0,0 +1,32 @@
+/** HPI Version Definitions
+Development releases have odd minor version.
+Production releases have even minor version.
+
+\file hpi_version.h
+*/
+
+#ifndef _HPI_VERSION_H
+#define _HPI_VERSION_H
+
+/* Use single digits for versions less that 10 to avoid octal. */
+/* *** HPI_VER is the only edit required to update version *** */
+/** HPI version */
+#define HPI_VER HPI_VERSION_CONSTRUCTOR(4, 10, 1)
+
+/** HPI version string in dotted decimal format */
+#define HPI_VER_STRING "4.10.01"
+
+/** Library version as documented in hpi-api-versions.txt */
+#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(10, 2, 0)
+
+/** Construct hpi version number from major, minor, release numbers */
+#define HPI_VERSION_CONSTRUCTOR(maj, min, r) ((maj << 16) + (min << 8) + r)
+
+/** Extract major version from hpi version number */
+#define HPI_VER_MAJOR(v) ((int)(v >> 16))
+/** Extract minor version from hpi version number */
+#define HPI_VER_MINOR(v) ((int)((v >> 8) & 0xFF))
+/** Extract release from hpi version number */
+#define HPI_VER_RELEASE(v) ((int)(v & 0xFF))
+
+#endif
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index bd47521b24ec..7ed5c26c3737 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -68,7 +68,7 @@ u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr)
 u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
 {
         u16 retval = 0;
-        /*HPI_ASSERT(pao->wAdapterType); */
+        /*HPI_ASSERT(pao->type); */
 
         hpios_alistlock_lock(&adapters);
 
@@ -77,13 +77,13 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
                 goto unlock;
         }
 
-        if (adapters.adapter[pao->index].adapter_type) {
+        if (adapters.adapter[pao->index].type) {
                 int a;
                 for (a = HPI_MAX_ADAPTERS - 1; a >= 0; a--) {
-                        if (!adapters.adapter[a].adapter_type) {
+                        if (!adapters.adapter[a].type) {
                                 HPI_DEBUG_LOG(WARNING,
                                         "ASI%X duplicate index %d moved to %d\n",
-                                        pao->adapter_type, pao->index, a);
+                                        pao->type, pao->index, a);
                                 pao->index = a;
                                 break;
                         }
@@ -104,13 +104,13 @@ unlock:
 
 void hpi_delete_adapter(struct hpi_adapter_obj *pao)
 {
-        if (!pao->adapter_type) {
+        if (!pao->type) {
                 HPI_DEBUG_LOG(ERROR, "removing null adapter?\n");
                 return;
         }
 
         hpios_alistlock_lock(&adapters);
-        if (adapters.adapter[pao->index].adapter_type)
+        if (adapters.adapter[pao->index].type)
                 adapters.gw_num_adapters--;
         memset(&adapters.adapter[pao->index], 0, sizeof(adapters.adapter[0]));
         hpios_alistlock_unlock(&adapters);
@@ -132,7 +132,7 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
         }
 
         pao = &adapters.adapter[adapter_index];
-        if (pao->adapter_type != 0) {
+        if (pao->type != 0) {
                 /*
                    HPI_DEBUG_LOG(VERBOSE, "Found adapter index %d\n",
                    wAdapterIndex);
@@ -165,7 +165,7 @@ static void subsys_get_adapter(struct hpi_message *phm,
 
         /* find the nCount'th nonzero adapter in array */
         for (index = 0; index < HPI_MAX_ADAPTERS; index++) {
-                if (adapters.adapter[index].adapter_type) {
+                if (adapters.adapter[index].type) {
                         if (!count)
                                 break;
                         count--;
@@ -174,11 +174,11 @@ static void subsys_get_adapter(struct hpi_message *phm,
 
         if (index < HPI_MAX_ADAPTERS) {
                 phr->u.s.adapter_index = adapters.adapter[index].index;
-                phr->u.s.adapter_type = adapters.adapter[index].adapter_type;
+                phr->u.s.adapter_type = adapters.adapter[index].type;
         } else {
                 phr->u.s.adapter_index = 0;
                 phr->u.s.adapter_type = 0;
-                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
+                phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
         }
 }
 
@@ -324,6 +324,8 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
         }
 
         phr->error = 0;
+        phr->specific_error = 0;
+        phr->version = 0;
 
         /* set the default response size */
         response_size =
@@ -531,8 +533,12 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 found ? "Cached" : "Uncached", phm->adapter_index,
                 pI->control_index, pI->control_type, phm->u.c.attribute);
 
-        if (found)
+        if (found) {
                 phr->size = (u16)response_size;
+                phr->type = HPI_TYPE_RESPONSE;
+                phr->object = phm->object;
+                phr->function = phm->function;
+        }
 
         return found;
 }
@@ -631,7 +637,7 @@ struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
         if (!p_cache)
                 return NULL;
 
-        p_cache->p_info = kzalloc(sizeof(*p_cache->p_info) * control_count,
+        p_cache->p_info = kcalloc(control_count, sizeof(*p_cache->p_info),
                                   GFP_KERNEL);
         if (!p_cache->p_info) {
                 kfree(p_cache);
diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
index d53cdf6e535f..e44121283047 100644
--- a/sound/pci/asihpi/hpicmn.h
+++ b/sound/pci/asihpi/hpicmn.h
@@ -1,7 +1,7 @@
 /**
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -18,12 +18,15 @@
 
 */
 
+struct hpi_adapter_obj;
+
+/* a function that takes an adapter obj and returns an int */
+typedef int adapter_int_func(struct hpi_adapter_obj *pao);
+
 struct hpi_adapter_obj {
         struct hpi_pci pci;     /* PCI info - bus#,dev#,address etc */
-        u16 adapter_type;       /* ASI6701 etc */
-        u16 index;              /* */
-        u16 open;               /* =1 when adapter open */
-        u16 mixer_open;
+        u16 type;               /* 0x6644 == ASI6644 etc */
+        u16 index;
 
         struct hpios_spinlock dsp_lock;
 
diff --git a/sound/pci/asihpi/hpidebug.c b/sound/pci/asihpi/hpidebug.c
index b52baf62791e..ac86a1f1d3bf 100644
--- a/sound/pci/asihpi/hpidebug.c
+++ b/sound/pci/asihpi/hpidebug.c
@@ -1,7 +1,7 @@
 /************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpidebug.h b/sound/pci/asihpi/hpidebug.h
index 940f54c3c538..2c9af2329d36 100644
--- a/sound/pci/asihpi/hpidebug.h
+++ b/sound/pci/asihpi/hpidebug.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c
index 71d32c868c92..456a758f04f6 100644
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
@@ -25,6 +25,7 @@ hotplug firmware loader from individual dsp code files
 #define SOURCEFILE_NAME "hpidspcd.c"
 #include "hpidspcd.h"
 #include "hpidebug.h"
+#include "hpi_version.h"
 
 struct dsp_code_private {
         /**  Firmware descriptor */
@@ -32,9 +33,6 @@ struct dsp_code_private {
         struct pci_dev *dev;
 };
 
-#define HPI_VER_DECIMAL ((int)(HPI_VER_MAJOR(HPI_VER) * 10000 + \
-            HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))
-
 /*-------------------------------------------------------------------*/
 short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code,
         u32 *os_error_code)
@@ -66,22 +64,25 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code,
         if ((header.type != 0x45444F43) ||      /* "CODE" */
                 (header.adapter != adapter)
                 || (header.size != firmware->size)) {
-                dev_printk(KERN_ERR, &dev->dev, "Invalid firmware file\n");
+                dev_printk(KERN_ERR, &dev->dev,
+                        "Invalid firmware header size %d != file %zd\n",
+                        header.size, firmware->size);
                 goto error2;
         }
 
-        if ((header.version / 100 & ~1) != (HPI_VER_DECIMAL / 100 & ~1)) {
+        if ((header.version >> 9) != (HPI_VER >> 9)) {
+                /* Consider even and subsequent odd minor versions to be compatible */
                 dev_printk(KERN_ERR, &dev->dev,
                         "Incompatible firmware version "
-                        "DSP image %d != Driver %d\n", header.version,
-                        HPI_VER_DECIMAL);
+                        "DSP image %X != Driver %X\n", header.version,
+                        HPI_VER);
                 goto error2;
         }
 
-        if (header.version != HPI_VER_DECIMAL) {
-                dev_printk(KERN_WARNING, &dev->dev,
-                        "Firmware: release version mismatch  DSP image %d != Driver %d\n",
-                        header.version, HPI_VER_DECIMAL);
+        if (header.version != HPI_VER) {
+                dev_printk(KERN_INFO, &dev->dev,
+                        "Firmware: release version mismatch  DSP image %X != Driver %X\n",
+                        header.version, HPI_VER);
         }
 
         HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);
@@ -108,11 +109,8 @@ error1:
 /*-------------------------------------------------------------------*/
 void hpi_dsp_code_close(struct dsp_code *dsp_code)
 {
-        if (dsp_code->pvt->firmware) {
-                HPI_DEBUG_LOG(DEBUG, "dsp code closed\n");
-                release_firmware(dsp_code->pvt->firmware);
-                dsp_code->pvt->firmware = NULL;
-        }
+        HPI_DEBUG_LOG(DEBUG, "dsp code closed\n");
+        release_firmware(dsp_code->pvt->firmware);
         kfree(dsp_code->pvt);
 }
 
diff --git a/sound/pci/asihpi/hpidspcd.h b/sound/pci/asihpi/hpidspcd.h
index b22881122f19..659d19ca6d42 100644
--- a/sound/pci/asihpi/hpidspcd.h
+++ b/sound/pci/asihpi/hpidspcd.h
@@ -27,10 +27,6 @@ Functions for reading DSP code to load into DSP
 
 #include "hpi_internal.h"
 
-/** Code header version is decimal encoded e.g. 4.06.10 is 40601 */
-#define HPI_VER_DECIMAL ((int)(HPI_VER_MAJOR(HPI_VER) * 10000 + \
-HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))
-
 /** Header structure for dsp firmware file
  This structure must match that used in s2bin.c for generation of asidsp.bin
  */
diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c
index ebb568d695f1..510e56cffd31 100644
--- a/sound/pci/asihpi/hpifunc.c
+++ b/sound/pci/asihpi/hpifunc.c
@@ -2826,6 +2826,16 @@ u16 hpi_volume_auto_fade(u32 h_control,
                 duration_ms, HPI_VOLUME_AUTOFADE_LOG);
 }
 
+u16 hpi_volume_query_auto_fade_profile(const u32 h_volume, const u32 i,
+        u16 *profile)
+{
+        u16 e;
+        u32 u;
+        e = hpi_control_query(h_volume, HPI_VOLUME_AUTOFADE, i, 0, &u);
+        *profile = (u16)u;
+        return e;
+}
+
 u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB)
 {
         struct hpi_message hm;
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c
index 52400a6b5f15..032d563e3708 100644
--- a/sound/pci/asihpi/hpimsginit.c
+++ b/sound/pci/asihpi/hpimsginit.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpimsginit.h b/sound/pci/asihpi/hpimsginit.h
index bfd330d78b58..5b48708c7d1e 100644
--- a/sound/pci/asihpi/hpimsginit.h
+++ b/sound/pci/asihpi/hpimsginit.h
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
index 2e779421a618..d4790ddc225c 100644
--- a/sound/pci/asihpi/hpimsgx.c
+++ b/sound/pci/asihpi/hpimsgx.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -22,6 +22,7 @@ Extended Message Function With Response Caching
 *****************************************************************************/
 #define SOURCEFILE_NAME "hpimsgx.c"
 #include "hpi_internal.h"
+#include "hpi_version.h"
 #include "hpimsginit.h"
 #include "hpicmn.h"
 #include "hpimsgx.h"
diff --git a/sound/pci/asihpi/hpimsgx.h b/sound/pci/asihpi/hpimsgx.h
index fd49e7542a88..37f3efd95a70 100644
--- a/sound/pci/asihpi/hpimsgx.h
+++ b/sound/pci/asihpi/hpimsgx.h
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index f6b9517b4696..609156205562 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -21,6 +21,7 @@ Common Linux HPI ioctl and module probe/remove functions
 #define SOURCEFILE_NAME "hpioctl.c"
 
 #include "hpi_internal.h"
+#include "hpi_version.h"
 #include "hpimsginit.h"
 #include "hpidebug.h"
 #include "hpimsgx.h"
@@ -65,9 +66,7 @@ static struct hpi_adapter adapters[HPI_MAX_ADAPTERS];
 static void hpi_send_recv_f(struct hpi_message *phm, struct hpi_response *phr,
         struct file *file)
 {
-        int adapter = phm->adapter_index;
-
-        if ((adapter >= HPI_MAX_ADAPTERS || adapter < 0)
+        if ((phm->adapter_index >= HPI_MAX_ADAPTERS)
                 && (phm->object != HPI_OBJ_SUBSYSTEM))
                 phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
         else
@@ -178,19 +177,14 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         } else {
                 u16 __user *ptr = NULL;
                 u32 size = 0;
-                u32 adapter_present;
                 /* -1=no data 0=read from user mem, 1=write to user mem */
                 int wrflag = -1;
-                struct hpi_adapter *pa;
+                struct hpi_adapter *pa = NULL;
 
-                if (hm->h.adapter_index < HPI_MAX_ADAPTERS) {
+                if (hm->h.adapter_index < ARRAY_SIZE(adapters))
                         pa = &adapters[hm->h.adapter_index];
-                        adapter_present = pa->type;
-                } else {
-                        adapter_present = 0;
-                }
 
-                if (!adapter_present) {
+                if (!pa || !pa->adapter || !pa->adapter->type) {
                         hpi_init_response(&hr->r0, hm->h.object,
                                 hm->h.function, HPI_ERROR_BAD_ADAPTER_NUMBER);
 
@@ -317,6 +311,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         const struct pci_device_id *pci_id)
 {
         int idx, nm;
+        int adapter_index;
         unsigned int memlen;
         struct hpi_message hm;
         struct hpi_response hr;
@@ -345,8 +340,6 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
 
         hm.adapter_index = HPI_ADAPTER_INDEX_INVALID;
 
-        adapter.pci = pci_dev;
-
         nm = HPI_MAX_ADAPTER_MEM_SPACES;
 
         for (idx = 0; idx < nm; idx++) {
@@ -355,18 +348,16 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
 
                 if (pci_resource_flags(pci_dev, idx) & IORESOURCE_MEM) {
                         memlen = pci_resource_len(pci_dev, idx);
-                        adapter.ap_remapped_mem_base[idx] =
+                        pci.ap_mem_base[idx] =
                                 ioremap(pci_resource_start(pci_dev, idx),
                                 memlen);
-                        if (!adapter.ap_remapped_mem_base[idx]) {
+                        if (!pci.ap_mem_base[idx]) {
                                 HPI_DEBUG_LOG(ERROR,
                                         "ioremap failed, aborting\n");
                                 /* unmap previously mapped pci mem space */
                                 goto err;
                         }
                 }
-
-                pci.ap_mem_base[idx] = adapter.ap_remapped_mem_base[idx];
         }
 
         pci.pci_dev = pci_dev;
@@ -378,6 +369,9 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         if (hr.error)
                 goto err;
 
+        adapter_index = hr.u.s.adapter_index;
+        adapter.adapter = hpi_find_adapter(adapter_index);
+
         if (prealloc_stream_buf) {
                 adapter.p_buffer = vmalloc(prealloc_stream_buf);
                 if (!adapter.p_buffer) {
@@ -389,36 +383,32 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
                 }
         }
 
-        adapter.index = hr.u.s.adapter_index;
-        adapter.type = hr.u.s.adapter_type;
-
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
                 HPI_ADAPTER_OPEN);
-        hm.adapter_index = adapter.index;
+        hm.adapter_index = adapter.adapter->index;
         hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
 
         if (hr.error)
                 goto err;
 
-        adapter.snd_card_asihpi = NULL;
         /* WARNING can't init mutex in 'adapter'
          * and then copy it to adapters[] ?!?!
          */
-        adapters[adapter.index] = adapter;
-        mutex_init(&adapters[adapter.index].mutex);
-        pci_set_drvdata(pci_dev, &adapters[adapter.index]);
+        adapters[adapter_index] = adapter;
+        mutex_init(&adapters[adapter_index].mutex);
+        pci_set_drvdata(pci_dev, &adapters[adapter_index]);
 
         dev_printk(KERN_INFO, &pci_dev->dev,
-                "probe succeeded for ASI%04X HPI index %d\n", adapter.type,
-                adapter.index);
+                "probe succeeded for ASI%04X HPI index %d\n",
+                adapter.adapter->type, adapter_index);
 
         return 0;
 
 err:
         for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) {
-                if (adapter.ap_remapped_mem_base[idx]) {
-                        iounmap(adapter.ap_remapped_mem_base[idx]);
-                        adapter.ap_remapped_mem_base[idx] = NULL;
+                if (pci.ap_mem_base[idx]) {
+                        iounmap(pci.ap_mem_base[idx]);
+                        pci.ap_mem_base[idx] = NULL;
                 }
         }
 
@@ -437,19 +427,20 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
         struct hpi_message hm;
         struct hpi_response hr;
         struct hpi_adapter *pa;
+        struct hpi_pci pci;
+
         pa = pci_get_drvdata(pci_dev);
+        pci = pa->adapter->pci;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
                 HPI_ADAPTER_DELETE);
-        hm.adapter_index = pa->index;
+        hm.adapter_index = pa->adapter->index;
         hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
 
         /* unmap PCI memory space, mapped during device init. */
         for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) {
-                if (pa->ap_remapped_mem_base[idx]) {
-                        iounmap(pa->ap_remapped_mem_base[idx]);
-                        pa->ap_remapped_mem_base[idx] = NULL;
-                }
+                if (pci.ap_mem_base[idx])
+                        iounmap(pci.ap_mem_base[idx]);
         }
 
         if (pa->p_buffer)
@@ -461,7 +452,7 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
                         "remove %04x:%04x,%04x:%04x,%04x," " HPI index %d.\n",
                         pci_dev->vendor, pci_dev->device,
                         pci_dev->subsystem_vendor, pci_dev->subsystem_device,
-                        pci_dev->devfn, pa->index);
+                        pci_dev->devfn, pa->adapter->index);
 
         memset(pa, 0, sizeof(*pa));
 }
diff --git a/sound/pci/asihpi/hpioctl.h b/sound/pci/asihpi/hpioctl.h
index 847f72f03fe1..2614aff672e2 100644
--- a/sound/pci/asihpi/hpioctl.h
+++ b/sound/pci/asihpi/hpioctl.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c
index ff2a19b544fa..2d7d1c2e1d0d 100644
--- a/sound/pci/asihpi/hpios.c
+++ b/sound/pci/asihpi/hpios.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h
index 2f605e34bad0..c5cef113c209 100644
--- a/sound/pci/asihpi/hpios.h
+++ b/sound/pci/asihpi/hpios.h
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -149,20 +149,18 @@ static inline void cond_unlock(struct hpios_spinlock *l)
 #define hpios_alistlock_lock(obj) spin_lock(&((obj)->list_lock.lock))
 #define hpios_alistlock_unlock(obj) spin_unlock(&((obj)->list_lock.lock))
 
+struct snd_card;
+
+/** pci drvdata points to an instance of this struct */
 struct hpi_adapter {
+        struct hpi_adapter_obj *adapter;
+        struct snd_card *snd_card;
+
         /* mutex prevents contention for one card
            between multiple user programs (via ioctl) */
         struct mutex mutex;
-        u16 index;
-        u16 type;
-
-        /* ALSA card structure */
-        void *snd_card_asihpi;
-
         char *p_buffer;
         size_t buffer_size;
-        struct pci_dev *pci;
-        void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];
 };
 
 #endif
diff --git a/sound/pci/asihpi/hpipcida.h b/sound/pci/asihpi/hpipcida.h
index bb30868ce1a3..db570ddf64b3 100644
--- a/sound/pci/asihpi/hpipcida.h
+++ b/sound/pci/asihpi/hpipcida.h
@@ -1,7 +1,7 @@
 /******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 15e4e5ee3881..590682f115ef 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -43,7 +43,7 @@ static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
 static int ac97_clock = 48000;
 static char *ac97_quirk;
-static int spdif_aclink = 1;
+static bool spdif_aclink = 1;
 static int ac97_codec = -1;
 
 module_param(index, int, 0444);
@@ -60,7 +60,7 @@ module_param(spdif_aclink, bool, 0444);
 MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 57bf8f4bc7a8..524d35f31232 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -51,7 +51,7 @@ module_param(ac97_clock, int, 0444);
 MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index dc326be58c4b..762bb108c51c 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -26,7 +26,7 @@
 // module parameters (see "Module Parameters")
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static int pcifix[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 255 };
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 489150380eac..6933a27a5d76 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -805,7 +805,7 @@ static void vortex_fifo_setadbvalid(vortex_t * vortex, int fifo, int en)
 }
 
 static void
-vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b, int priority,
+vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int stereo, int priority,
                        int empty, int valid, int f)
 {
         int temp, lifeboat = 0;
@@ -837,7 +837,7 @@ vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b, int priority,
 #else
                         temp = (this_4 & 0x3f) << 0xc;
 #endif
-                        temp = (temp & 0xfffffffd) | ((b & 1) << 1);
+                        temp = (temp & 0xfffffffd) | ((stereo & 1) << 1);
                         temp = (temp & 0xfffffff3) | ((priority & 3) << 2);
                         temp = (temp & 0xffffffef) | ((valid & 1) << 4);
                         temp |= FIFO_U1;
@@ -1148,11 +1148,11 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
 
 static void
 vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
-                      int fmt, int d, u32 offset)
+                      int fmt, int stereo, u32 offset)
 {
         stream_t *dma = &vortex->dma_adb[adbdma];
 
-        dma->dma_unknown = d;
+        dma->dma_unknown = stereo;
         dma->dma_ctrl =
             ((offset & OFFSET_MASK) | (dma->dma_ctrl & ~OFFSET_MASK));
         /* Enable PCMOUT interrupts. */
@@ -1336,7 +1336,6 @@ static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma)
         dma->fifo_status = FIFO_PAUSE;
 }
 
-#if 0                           // Using pause instead
 static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)
 {
         stream_t *dma = &vortex->dma_adb[adbdma];
@@ -1351,7 +1350,6 @@ static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)
         dma->fifo_enabled = 0;
 }
 
-#endif
 /* WTDMA */
 
 #ifndef CHIP_AU8810
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index c5f7ae46afef..0488633ea874 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -307,8 +307,8 @@ static int snd_vortex_pcm_prepare(struct snd_pcm_substream *substream)
         fmt = vortex_alsafmt_aspfmt(runtime->format);
         spin_lock_irq(&chip->lock);
         if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) {
-                vortex_adbdma_setmode(chip, dma, 1, dir, fmt, 0 /*? */ ,
-                                      0);
+                vortex_adbdma_setmode(chip, dma, 1, dir, fmt,
+                                runtime->channels == 1 ? 0 : 1, 0);
                 vortex_adbdma_setstartbuffer(chip, dma, 0);
                 if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_SPDIF)
                         vortex_adb_setsrc(chip, dma, runtime->rate, dir);
@@ -353,8 +353,7 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 //printk(KERN_INFO "vortex: stop %d\n", dma);
                 stream->fifo_enabled = 0;
                 if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT)
-                        vortex_adbdma_pausefifo(chip, dma);
-                //vortex_adbdma_stopfifo(chip, dma);
+                        vortex_adbdma_stopfifo(chip, dma);
 #ifndef CHIP_AU8810
                 else {
                         printk(KERN_INFO "vortex: wt stop %d\n", dma);
diff --git a/sound/pci/au88x0/au88x0_xtalk.c b/sound/pci/au88x0/au88x0_xtalk.c
index b4151e208b71..b278e285fd40 100644
--- a/sound/pci/au88x0/au88x0_xtalk.c
+++ b/sound/pci/au88x0/au88x0_xtalk.c
@@ -48,43 +48,61 @@ static unsigned short const wXtalkNarrowLeftDelay = 0x7;
 static unsigned short const wXtalkNarrowRightDelay = 0x7;
 
 static xtalk_gains_t const asXtalkGainsDefault = {
-        0x4000, 0x4000, 4000, 0x4000, 4000, 0x4000, 4000, 0x4000, 4000,
-        0x4000
+        0x4000, 0x4000, 0x4000, 0x4000, 0x4000,
+        0x4000, 0x4000, 0x4000, 0x4000, 0x4000
 };
 
 static xtalk_gains_t const asXtalkGainsTest = {
-        0x8000, 0x7FFF, 0, 0xFFFF, 0x0001, 0xC000, 0x4000, 0xFFFE, 0x0002,
-        0
+        0x7fff, 0x8000, 0x0000, 0x0000, 0x0001,
+        0xffff, 0x4000, 0xc000, 0x0002, 0xfffe
 };
+
 static xtalk_gains_t const asXtalkGains1Chan = {
-        0x7FFF, 0, 0, 0, 0x7FFF, 0, 0, 0, 0, 0
+        0x7FFF, 0, 0, 0, 0,
+        0x7FFF, 0, 0, 0, 0,
 };
 
 // Input gain for 4 A3D slices. One possible input pair is left zero.
 static xtalk_gains_t const asXtalkGainsAllChan = {
-        0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,
-        0
-            //0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff,0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff
+        0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0,
+        0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0
+};
+
+static xtalk_gains_t const asXtalkGainsZeros = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
-static xtalk_gains_t const asXtalkGainsZeros;
 
-static xtalk_dline_t const alXtalkDlineZeros;
+static xtalk_dline_t const alXtalkDlineZeros = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
 static xtalk_dline_t const alXtalkDlineTest = {
-        0xFC18, 0x03E8FFFF, 0x186A0, 0x7960FFFE, 1, 0xFFFFFFFF,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0x0000fc18, 0xfff03e8, 0x000186a0, 0xfffe7960, 1, 0xffffffff, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static xtalk_instate_t const asXtalkInStateZeros = {
         0, 0, 0, 0
 };
 
-static xtalk_instate_t const asXtalkInStateZeros;
-static xtalk_instate_t const asXtalkInStateTest =
-    { 0xFF80, 0x0080, 0xFFFF, 0x0001 };
-static xtalk_state_t const asXtalkOutStateZeros;
+static xtalk_instate_t const asXtalkInStateTest = {
+        0x0080, 0xff80, 0x0001, 0xffff
+};
+
+static xtalk_state_t const asXtalkOutStateZeros = {
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0}
+};
 
 static short const sDiamondKLeftEq = 0x401d;
 static short const sDiamondKRightEq = 0x401d;
 static short const sDiamondKLeftXt = 0xF90E;
 static short const sDiamondKRightXt = 0xF90E;
-static short const sDiamondShiftLeftEq = 1;     /* 0xF90E Is this a bug ??? */
+static short const sDiamondShiftLeftEq = 1;
 static short const sDiamondShiftRightEq = 1;
 static short const sDiamondShiftLeftXt = 0;
 static short const sDiamondShiftRightXt = 0;
@@ -94,29 +112,29 @@ static unsigned short const wDiamondRightDelay = 0xb;
 static xtalk_coefs_t const asXtalkWideCoefsLeftEq = {
         {0xEC4C, 0xDCE9, 0xFDC2, 0xFEEC, 0},
         {0x5F60, 0xCBCB, 0xFC26, 0x0305, 0},
-        {0x340B, 0xf504, 0x6CE8, 0x0D23, 0x00E4},
-        {0xD500, 0x8D76, 0xACC7, 0x5B05, 0x00FA},
+        {0x340B, 0xe8f5, 0x236c, 0xe40d, 0},
+        {0x76d5, 0xc78d, 0x05ac, 0xfa5b, 0},
         {0x7F04, 0xC0FA, 0x0263, 0xFDA2, 0}
 };
 static xtalk_coefs_t const asXtalkWideCoefsRightEq = {
         {0xEC4C, 0xDCE9, 0xFDC2, 0xFEEC, 0},
         {0x5F60, 0xCBCB, 0xFC26, 0x0305, 0},
-        {0x340B, 0xF504, 0x6CE8, 0x0D23, 0x00E4},
-        {0xD500, 0x8D76, 0xACC7, 0x5B05, 0x00FA},
+        {0x340B, 0xe8f5, 0x236c, 0xe40d, 0},
+        {0x76d5, 0xc78d, 0x05ac, 0xfa5b, 0},
         {0x7F04, 0xC0FA, 0x0263, 0xFDA2, 0}
 };
 static xtalk_coefs_t const asXtalkWideCoefsLeftXt = {
-        {0x86C3, 0x7B55, 0x89C3, 0x005B, 0x0047},
-        {0x6000, 0x206A, 0xC6CA, 0x40FF, 0},
-        {0x1100, 0x1164, 0xA1D7, 0x90FC, 0x0001},
-        {0xDC00, 0x9E77, 0xB8C7, 0x0AFF, 0},
+        {0x55c6, 0xc97b, 0x005b, 0x0047, 0},
+        {0x6a60, 0xca20, 0xffc6, 0x0040, 0},
+        {0x6411, 0xd711, 0xfca1, 0x0190, 0},
+        {0x77dc, 0xc79e, 0xffb8, 0x000a, 0},
         {0, 0, 0, 0, 0}
 };
 static xtalk_coefs_t const asXtalkWideCoefsRightXt = {
-        {0x86C3, 0x7B55, 0x89C3, 0x005B, 0x0047},
-        {0x6000, 0x206A, 0xC6CA, 0x40FF, 0},
-        {0x1100, 0x1164, 0xA1D7, 0x90FC, 0x0001},
-        {0xDC00, 0x9E77, 0xB8C7, 0x0AFF, 0},
+        {0x55c6, 0xc97b, 0x005b, 0x0047, 0},
+        {0x6a60, 0xca20, 0xffc6, 0x0040, 0},
+        {0x6411, 0xd711, 0xfca1, 0x0190, 0},
+        {0x77dc, 0xc79e, 0xffb8, 0x000a, 0},
         {0, 0, 0, 0, 0}
 };
 static xtalk_coefs_t const asXtalkNarrowCoefsLeftEq = {
@@ -151,7 +169,14 @@ static xtalk_coefs_t const asXtalkNarrowCoefsRightXt = {
         {0, 0, 0, 0, 0}
 };
 
-static xtalk_coefs_t const asXtalkCoefsZeros;
+static xtalk_coefs_t const asXtalkCoefsZeros = {
+        {0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0}
+};
+
 static xtalk_coefs_t const asXtalkCoefsPipe = {
         {0, 0, 0x0FA0, 0, 0},
         {0, 0, 0x0FA0, 0, 0},
@@ -186,7 +211,7 @@ static xtalk_coefs_t const asXtalkCoefsDenTest = {
 static xtalk_state_t const asXtalkOutStateTest = {
         {0x7FFF, 0x0004, 0xFFFC, 0},
         {0xFE00, 0x0008, 0xFFF8, 0x4000},
-        {0x200, 0x0010, 0xFFF0, 0xC000},
+        {0x0200, 0x0010, 0xFFF0, 0xC000},
         {0x8000, 0x0020, 0xFFE0, 0},
         {0, 0, 0, 0}
 };
@@ -306,10 +331,10 @@ vortex_XtalkHw_SetLeftEQStates(vortex_t * vortex,
                 hwwrite(vortex->mmio, 0x2421C + i * 0x24, coefs[i][2]);
                 hwwrite(vortex->mmio, 0x24220 + i * 0x24, coefs[i][3]);
         }
-        hwwrite(vortex->mmio, 0x244F8 + i * 0x24, arg_0[0]);
-        hwwrite(vortex->mmio, 0x244FC + i * 0x24, arg_0[1]);
-        hwwrite(vortex->mmio, 0x24500 + i * 0x24, arg_0[2]);
-        hwwrite(vortex->mmio, 0x24504 + i * 0x24, arg_0[3]);
+        hwwrite(vortex->mmio, 0x244F8, arg_0[0]);
+        hwwrite(vortex->mmio, 0x244FC, arg_0[1]);
+        hwwrite(vortex->mmio, 0x24500, arg_0[2]);
+        hwwrite(vortex->mmio, 0x24504, arg_0[3]);
 }
 
 static void
@@ -325,10 +350,10 @@ vortex_XtalkHw_SetRightEQStates(vortex_t * vortex,
                 hwwrite(vortex->mmio, 0x242D0 + i * 0x24, coefs[i][2]);
                 hwwrite(vortex->mmio, 0x244D4 + i * 0x24, coefs[i][3]);
         }
-        hwwrite(vortex->mmio, 0x24508 + i * 0x24, arg_0[0]);
-        hwwrite(vortex->mmio, 0x2450C + i * 0x24, arg_0[1]);
-        hwwrite(vortex->mmio, 0x24510 + i * 0x24, arg_0[2]);
-        hwwrite(vortex->mmio, 0x24514 + i * 0x24, arg_0[3]);
+        hwwrite(vortex->mmio, 0x24508, arg_0[0]);
+        hwwrite(vortex->mmio, 0x2450C, arg_0[1]);
+        hwwrite(vortex->mmio, 0x24510, arg_0[2]);
+        hwwrite(vortex->mmio, 0x24514, arg_0[3]);
 }
 
 static void
@@ -344,10 +369,10 @@ vortex_XtalkHw_SetLeftXTStates(vortex_t * vortex,
                 hwwrite(vortex->mmio, 0x24384 + i * 0x24, coefs[i][2]);
                 hwwrite(vortex->mmio, 0x24388 + i * 0x24, coefs[i][3]);
         }
-        hwwrite(vortex->mmio, 0x24518 + i * 0x24, arg_0[0]);
-        hwwrite(vortex->mmio, 0x2451C + i * 0x24, arg_0[1]);
-        hwwrite(vortex->mmio, 0x24520 + i * 0x24, arg_0[2]);
-        hwwrite(vortex->mmio, 0x24524 + i * 0x24, arg_0[3]);
+        hwwrite(vortex->mmio, 0x24518, arg_0[0]);
+        hwwrite(vortex->mmio, 0x2451C, arg_0[1]);
+        hwwrite(vortex->mmio, 0x24520, arg_0[2]);
+        hwwrite(vortex->mmio, 0x24524, arg_0[3]);
 }
 
 static void
@@ -363,10 +388,10 @@ vortex_XtalkHw_SetRightXTStates(vortex_t * vortex,
                 hwwrite(vortex->mmio, 0x24438 + i * 0x24, coefs[i][2]);
                 hwwrite(vortex->mmio, 0x2443C + i * 0x24, coefs[i][3]);
         }
-        hwwrite(vortex->mmio, 0x24528 + i * 0x24, arg_0[0]);
-        hwwrite(vortex->mmio, 0x2452C + i * 0x24, arg_0[1]);
-        hwwrite(vortex->mmio, 0x24530 + i * 0x24, arg_0[2]);
-        hwwrite(vortex->mmio, 0x24534 + i * 0x24, arg_0[3]);
+        hwwrite(vortex->mmio, 0x24528, arg_0[0]);
+        hwwrite(vortex->mmio, 0x2452C, arg_0[1]);
+        hwwrite(vortex->mmio, 0x24530, arg_0[2]);
+        hwwrite(vortex->mmio, 0x24534, arg_0[3]);
 }
 
 #if 0
@@ -450,10 +475,10 @@ vortex_XtalkHw_GetLeftEQStates(vortex_t * vortex, xtalk_instate_t arg_0,
                 coefs[i][2] = hwread(vortex->mmio, 0x2421C + i * 0x24);
                 coefs[i][3] = hwread(vortex->mmio, 0x24220 + i * 0x24);
         }
-        arg_0[0] = hwread(vortex->mmio, 0x244F8 + i * 0x24);
-        arg_0[1] = hwread(vortex->mmio, 0x244FC + i * 0x24);
-        arg_0[2] = hwread(vortex->mmio, 0x24500 + i * 0x24);
-        arg_0[3] = hwread(vortex->mmio, 0x24504 + i * 0x24);
+        arg_0[0] = hwread(vortex->mmio, 0x244F8);
+        arg_0[1] = hwread(vortex->mmio, 0x244FC);
+        arg_0[2] = hwread(vortex->mmio, 0x24500);
+        arg_0[3] = hwread(vortex->mmio, 0x24504);
 }
 
 static void
@@ -468,10 +493,10 @@ vortex_XtalkHw_GetRightEQStates(vortex_t * vortex, xtalk_instate_t arg_0,
                 coefs[i][2] = hwread(vortex->mmio, 0x242D0 + i * 0x24);
                 coefs[i][3] = hwread(vortex->mmio, 0x242D4 + i * 0x24);
         }
-        arg_0[0] = hwread(vortex->mmio, 0x24508 + i * 0x24);
-        arg_0[1] = hwread(vortex->mmio, 0x2450C + i * 0x24);
-        arg_0[2] = hwread(vortex->mmio, 0x24510 + i * 0x24);
-        arg_0[3] = hwread(vortex->mmio, 0x24514 + i * 0x24);
+        arg_0[0] = hwread(vortex->mmio, 0x24508);
+        arg_0[1] = hwread(vortex->mmio, 0x2450C);
+        arg_0[2] = hwread(vortex->mmio, 0x24510);
+        arg_0[3] = hwread(vortex->mmio, 0x24514);
 }
 
 static void
@@ -486,10 +511,10 @@ vortex_XtalkHw_GetLeftXTStates(vortex_t * vortex, xtalk_instate_t arg_0,
                 coefs[i][2] = hwread(vortex->mmio, 0x24384 + i * 0x24);
                 coefs[i][3] = hwread(vortex->mmio, 0x24388 + i * 0x24);
         }
-        arg_0[0] = hwread(vortex->mmio, 0x24518 + i * 0x24);
-        arg_0[1] = hwread(vortex->mmio, 0x2451C + i * 0x24);
-        arg_0[2] = hwread(vortex->mmio, 0x24520 + i * 0x24);
-        arg_0[3] = hwread(vortex->mmio, 0x24524 + i * 0x24);
+        arg_0[0] = hwread(vortex->mmio, 0x24518);
+        arg_0[1] = hwread(vortex->mmio, 0x2451C);
+        arg_0[2] = hwread(vortex->mmio, 0x24520);
+        arg_0[3] = hwread(vortex->mmio, 0x24524);
 }
 
 static void
@@ -504,10 +529,10 @@ vortex_XtalkHw_GetRightXTStates(vortex_t * vortex, xtalk_instate_t arg_0,
                 coefs[i][2] = hwread(vortex->mmio, 0x24438 + i * 0x24);
                 coefs[i][3] = hwread(vortex->mmio, 0x2443C + i * 0x24);
         }
-        arg_0[0] = hwread(vortex->mmio, 0x24528 + i * 0x24);
-        arg_0[1] = hwread(vortex->mmio, 0x2452C + i * 0x24);
-        arg_0[2] = hwread(vortex->mmio, 0x24530 + i * 0x24);
-        arg_0[3] = hwread(vortex->mmio, 0x24534 + i * 0x24);
+        arg_0[0] = hwread(vortex->mmio, 0x24528);
+        arg_0[1] = hwread(vortex->mmio, 0x2452C);
+        arg_0[2] = hwread(vortex->mmio, 0x24530);
+        arg_0[3] = hwread(vortex->mmio, 0x24534);
 }
 
 #endif
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 7a581151db0d..1c5231931462 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -153,7 +153,7 @@ static int snd_aw2_control_switch_capture_put(struct snd_kcontrol *kcontrol,
  ********************************/
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Audiowerk2 soundcard.");
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index bc1e6830b50d..95ffa6a9db6e 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -301,7 +301,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for AZF3328 soundcard.");
 
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable AZF3328 soundcard.");
 
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index c1c2d0c1c7f0..62d6163fc9d9 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -42,9 +42,9 @@ MODULE_SUPPORTED_DEVICE("{{Brooktree,Bt878},"
 
 static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* Exclude the first card */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int digital_rate[SNDRV_CARDS];   /* digital input rate */
-static int load_all;    /* allow to load the non-whitelisted cards */
+static bool load_all;   /* allow to load the non-whitelisted cards */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Bt87x soundcard");
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index fe99fdeaf15f..08d6ebfe5a61 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -156,7 +156,7 @@ MODULE_SUPPORTED_DEVICE("{{Creative,SB CA0106 chip}}");
 // module parameters (see "Module Parameters")
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 954c9934748a..19b06269adc2 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -54,10 +54,10 @@ MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8738},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable switches */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable switches */
 static long mpu_port[SNDRV_CARDS];
 static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
-static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
+static bool soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS];
 #endif
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index a6c6c5c53af9..a9f368f60df6 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -44,8 +44,8 @@ MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,CS4281}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable switches */
-static int dual_codec[SNDRV_CARDS];     /* dual codec */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable switches */
+static bool dual_codec[SNDRV_CARDS];    /* dual codec */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for CS4281 soundcard.");
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index a4ecb40f8507..819d79d0586d 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -46,10 +46,10 @@ MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,Sound Fusion (CS4280)},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int external_amp[SNDRV_CARDS];
-static int thinkpad[SNDRV_CARDS];
-static int mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool external_amp[SNDRV_CARDS];
+static bool thinkpad[SNDRV_CARDS];
+static bool mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the CS46xx soundcard.");
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 958f4949e973..c47cabff2bfa 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -50,7 +50,14 @@ MODULE_LICENSE("GPL");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for CS5530 Audio driver.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for CS5530 Audio driver.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable CS5530 Audio driver.");
 
 struct snd_cs5530 {
         struct snd_card *card;
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index b8959d2c804b..a2fb2173e980 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -57,7 +57,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME);
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index e083122ca55a..dbf94b189e75 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -148,7 +148,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
                 struct cs5535audio_dma_desc *desc =
                         &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i];
                 desc->addr = cpu_to_le32(addr);
-                desc->size = cpu_to_le32(period_bytes);
+                desc->size = cpu_to_le16(period_bytes);
                 desc->ctlreserved = cpu_to_le16(PRD_EOP);
                 desc_addr += sizeof(struct cs5535audio_dma_desc);
                 addr += period_bytes;
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index e134b3a5780d..6e77e86307c2 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -437,7 +437,7 @@ get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc)
 
         /* Allocate mem for master src resource */
         if (MEMRD == desc->mode)
-                src = kzalloc(sizeof(*src)*desc->multi, GFP_KERNEL);
+                src = kcalloc(desc->multi, sizeof(*src), GFP_KERNEL);
         else
                 src = kzalloc(sizeof(*src), GFP_KERNEL);
 
diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c
index 93b0aedc36d4..03fb909085af 100644
--- a/sound/pci/ctxfi/cttimer.c
+++ b/sound/pci/ctxfi/cttimer.c
@@ -15,8 +15,8 @@
 #include "cthardware.h"
 #include "cttimer.h"
 
-static int use_system_timer;
-MODULE_PARM_DESC(use_system_timer, "Foce to use system-timer");
+static bool use_system_timer;
+MODULE_PARM_DESC(use_system_timer, "Force to use system-timer");
 module_param(use_system_timer, bool, S_IRUGO);
 
 struct ct_timer_ops {
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index 33931ef5e129..15d95d2bacee 100644
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -32,7 +32,7 @@ module_param(multiple, uint, S_IRUGO);
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static unsigned int subsystem[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 9fd694c61866..595c11f904bb 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -26,7 +26,7 @@ MODULE_DEVICE_TABLE(pci, snd_echo_ids);
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for " ECHOCARD_NAME " soundcard.");
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index eaa198e122c0..790c65d980c8 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -44,13 +44,13 @@ MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int extin[SNDRV_CARDS];
 static int extout[SNDRV_CARDS];
 static int seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
 static int max_synth_voices[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 64};
 static int max_buffer_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128};
-static int enable_ir[SNDRV_CARDS];
+static bool enable_ir[SNDRV_CARDS];
 static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
 static uint delay_pcm_irq[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
 
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 6a3e5677f591..754924081d0a 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1480,6 +1480,18 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spdif_bug = 1,
          .invert_shared_spdif = 1,      /* digital/analog switch swapped */
          .ac97_chip = 1} ,
+        /* 0x20051102 also has SB0350 written on it, treated as Audigy 2 ZS by
+           Creative's Windows driver */
+        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20051102,
+         .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350a]",
+         .id = "Audigy2",
+         .emu10k2_chip = 1,
+         .ca0102_chip = 1,
+         .ca0151_chip = 1,
+         .spk71 = 1,
+         .spdif_bug = 1,
+         .invert_shared_spdif = 1,      /* digital/analog switch swapped */
+         .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
          .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",
          .id = "Audigy2",
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 2228be9f30e6..47a651cb6e84 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -50,7 +50,7 @@ MODULE_SUPPORTED_DEVICE("{{Dell Creative Labs,SB Live!}");
 // module parameters (see "Module Parameters")
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the EMU10K1X soundcard.");
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index d085ad03efe8..47a245e84190 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -83,12 +83,12 @@ MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI ES1371/73},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable switches */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable switches */
 #ifdef SUPPORT_JOYSTICK
 #ifdef CHIP1371
 static int joystick_port[SNDRV_CARDS];
 #else
-static int joystick[SNDRV_CARDS];
+static bool joystick[SNDRV_CARDS];
 #endif
 #endif
 #ifdef CHIP1371
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 04cc21f5d014..53eb76b41108 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -79,7 +79,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for ESS Solo-1 soundcard.");
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 297a151bdba9..cb557c603a80 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -132,7 +132,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,Maestro 2e},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 1-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int total_bufsize[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1024 };
 static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
 static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
@@ -140,7 +140,7 @@ static int clock[SNDRV_CARDS];
 static int use_pm[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
 static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
 #ifdef SUPPORT_JOYSTICK
-static int joystick[SNDRV_CARDS];
+static bool joystick[SNDRV_CARDS];
 #endif
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index ec05ef5a5abf..9597ef1eccca 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -48,7 +48,7 @@ MODULE_SUPPORTED_DEVICE("{{ForteMedia,FM801},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 /*
  *  Enable TEA575x tuner
  *    1 = MediaForte 256-PCS
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index e44b107fdc75..4562e9de6a1a 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4046,9 +4046,9 @@ int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
 
         /* Search for codec ID */
         for (q = tbl; q->subvendor; q++) {
-                unsigned long vendorid = (q->subdevice) | (q->subvendor << 16);
-
-                if (vendorid == codec->subsystem_id)
+                unsigned int mask = 0xffff0000 | q->subdevice_mask;
+                unsigned int id = (q->subdevice | (q->subvendor << 16)) & mask;
+                if ((codec->subsystem_id & mask) == id)
                         break;
         }
 
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 7ae7578bdcc0..c1da422e085a 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -347,18 +347,28 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
 
         for (i = 0; i < size; i++) {
                 unsigned int val = hdmi_get_eld_data(codec, nid, i);
+                /*
+                 * Graphics driver might be writing to ELD buffer right now.
+                 * Just abort. The caller will repoll after a while.
+                 */
                 if (!(val & AC_ELDD_ELD_VALID)) {
-                        if (!i) {
-                                snd_printd(KERN_INFO
-                                           "HDMI: invalid ELD data\n");
-                                ret = -EINVAL;
-                                goto error;
-                        }
                         snd_printd(KERN_INFO
                                   "HDMI: invalid ELD data byte %d\n", i);
-                        val = 0;
-                } else
-                        val &= AC_ELDD_ELD_DATA;
+                        ret = -EINVAL;
+                        goto error;
+                }
+                val &= AC_ELDD_ELD_DATA;
+                /*
+                 * The first byte cannot be zero. This can happen on some DVI
+                 * connections. Some Intel chips may also need some 250ms delay
+                 * to return non-zero ELD data, even when the graphics driver
+                 * correctly writes ELD content before setting ELD_valid bit.
+                 */
+                if (!val && !i) {
+                        snd_printdd(KERN_INFO "HDMI: 0 ELD data\n");
+                        ret = -EINVAL;
+                        goto error;
+                }
                 buf[i] = val;
         }
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 096507d2ca9a..06fe2c546ee4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -58,13 +58,13 @@
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static char *model[SNDRV_CARDS];
 static int position_fix[SNDRV_CARDS];
 static int bdl_pos_adj[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};
 static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};
 static int probe_only[SNDRV_CARDS];
-static int single_cmd;
+static bool single_cmd;
 static int enable_msi = -1;
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
 static char *patch[SNDRV_CARDS];
@@ -116,12 +116,12 @@ MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
  * this may give more power-saving, but will take longer time to
  * wake up.
  */
-static int power_save_controller = 1;
+static bool power_save_controller = 1;
 module_param(power_save_controller, bool, 0644);
 MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
 #endif
 
-static int align_buffer_size = 1;
+static bool align_buffer_size = 1;
 module_param(align_buffer_size, bool, 0644);
 MODULE_PARM_DESC(align_buffer_size,
                 "Force buffer and period sizes to be multiple of 128 bytes.");
@@ -2508,7 +2508,6 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 2fbab8e29576..70a7abda7e22 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -58,6 +58,8 @@ struct cs_spec {
         unsigned int gpio_mask;
         unsigned int gpio_dir;
         unsigned int gpio_data;
+        unsigned int gpio_eapd_hp; /* EAPD GPIO bit for headphones */
+        unsigned int gpio_eapd_speaker; /* EAPD GPIO bit for speakers */
 
         struct hda_pcm pcm_rec[2];      /* PCM information */
 
@@ -76,6 +78,7 @@ enum {
         CS420X_MBP53,
         CS420X_MBP55,
         CS420X_IMAC27,
+        CS420X_APPLE,
         CS420X_AUTO,
         CS420X_MODELS
 };
@@ -928,10 +931,9 @@ static void cs_automute(struct hda_codec *codec)
                                         spdif_present ? 0 : PIN_OUT);
                 }
         }
-        if (spec->board_config == CS420X_MBP53 ||
-            spec->board_config == CS420X_MBP55 ||
-            spec->board_config == CS420X_IMAC27) {
-                unsigned int gpio = hp_present ? 0x02 : 0x08;
+        if (spec->gpio_eapd_hp) {
+                unsigned int gpio = hp_present ?
+                        spec->gpio_eapd_hp : spec->gpio_eapd_speaker;
                 snd_hda_codec_write(codec, 0x01, 0,
                                     AC_VERB_SET_GPIO_DATA, gpio);
         }
@@ -1276,6 +1278,7 @@ static const char * const cs420x_models[CS420X_MODELS] = {
         [CS420X_MBP53] = "mbp53",
         [CS420X_MBP55] = "mbp55",
         [CS420X_IMAC27] = "imac27",
+        [CS420X_APPLE] = "apple",
         [CS420X_AUTO] = "auto",
 };
 
@@ -1285,7 +1288,13 @@ static const struct snd_pci_quirk cs420x_cfg_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
-        SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
+        /* this conflicts with too many other models */
+        /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/
+        {} /* terminator */
+};
+
+static const struct snd_pci_quirk cs420x_codec_cfg_tbl[] = {
+        SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE),
         {} /* terminator */
 };
 
@@ -1367,6 +1376,10 @@ static int patch_cs420x(struct hda_codec *codec)
         spec->board_config =
                 snd_hda_check_board_config(codec, CS420X_MODELS,
                                            cs420x_models, cs420x_cfg_tbl);
+        if (spec->board_config < 0)
+                spec->board_config =
+                        snd_hda_check_board_codec_sid_config(codec,
+                                CS420X_MODELS, NULL, cs420x_codec_cfg_tbl);
         if (spec->board_config >= 0)
                 fix_pincfg(codec, spec->board_config, cs_pincfgs);
 
@@ -1374,10 +1387,11 @@ static int patch_cs420x(struct hda_codec *codec)
         case CS420X_IMAC27:
         case CS420X_MBP53:
         case CS420X_MBP55:
-                /* GPIO1 = headphones */
-                /* GPIO3 = speakers */
-                spec->gpio_mask = 0x0a;
-                spec->gpio_dir = 0x0a;
+        case CS420X_APPLE:
+                spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */
+                spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
+                spec->gpio_mask = spec->gpio_dir =
+                        spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
                 break;
         }
 
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 9850c5b481ea..c505fd5d338c 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -69,6 +69,7 @@ struct hdmi_spec_per_pin {
         struct hda_codec *codec;
         struct hdmi_eld sink_eld;
         struct delayed_work work;
+        int repoll_count;
 };
 
 struct hdmi_spec {
@@ -748,7 +749,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
  * Unsolicited events
  */
 
-static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry);
+static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);
 
 static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
 {
@@ -766,7 +767,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
         if (pin_idx < 0)
                 return;
 
-        hdmi_present_sense(&spec->pins[pin_idx], true);
+        hdmi_present_sense(&spec->pins[pin_idx], 1);
 }
 
 static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
@@ -960,7 +961,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)
         return 0;
 }
 
-static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry)
+static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
 {
         struct hda_codec *codec = per_pin->codec;
         struct hdmi_eld *eld = &per_pin->sink_eld;
@@ -989,7 +990,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry)
         if (eld_valid) {
                 if (!snd_hdmi_get_eld(eld, codec, pin_nid))
                         snd_hdmi_show_eld(eld);
-                else if (retry) {
+                else if (repoll) {
                         queue_delayed_work(codec->bus->workq,
                                            &per_pin->work,
                                            msecs_to_jiffies(300));
@@ -1004,7 +1005,10 @@ static void hdmi_repoll_eld(struct work_struct *work)
         struct hdmi_spec_per_pin *per_pin =
         container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work);
 
-        hdmi_present_sense(per_pin, false);
+        if (per_pin->repoll_count++ > 6)
+                per_pin->repoll_count = 0;
+
+        hdmi_present_sense(per_pin, per_pin->repoll_count);
 }
 
 static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
@@ -1235,7 +1239,7 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
         if (err < 0)
                 return err;
 
-        hdmi_present_sense(per_pin, false);
+        hdmi_present_sense(per_pin, 0);
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 336d14eb72af..cbde019d3d52 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -277,6 +277,12 @@ static bool alc_dyn_adc_pcm_resetup(struct hda_codec *codec, int cur)
         return false;
 }
 
+static inline hda_nid_t get_capsrc(struct alc_spec *spec, int idx)
+{
+        return spec->capsrc_nids ?
+                spec->capsrc_nids[idx] : spec->adc_nids[idx];
+}
+
 /* select the given imux item; either unmute exclusively or select the route */
 static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
                           unsigned int idx, bool force)
@@ -303,8 +309,7 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
                 adc_idx = spec->dyn_adc_idx[idx];
         }
 
-        nid = spec->capsrc_nids ?
-                spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];
+        nid = get_capsrc(spec, adc_idx);
 
         /* no selection? */
         num_conns = snd_hda_get_conn_list(codec, nid, NULL);
@@ -1054,8 +1059,19 @@ static bool alc_rebuild_imux_for_auto_mic(struct hda_codec *codec)
         spec->imux_pins[2] = spec->dock_mic_pin;
         for (i = 0; i < 3; i++) {
                 strcpy(imux->items[i].label, texts[i]);
-                if (spec->imux_pins[i])
+                if (spec->imux_pins[i]) {
+                        hda_nid_t pin = spec->imux_pins[i];
+                        int c;
+                        for (c = 0; c < spec->num_adc_nids; c++) {
+                                hda_nid_t cap = get_capsrc(spec, c);
+                                int idx = get_connection_index(codec, cap, pin);
+                                if (idx >= 0) {
+                                        imux->items[i].index = idx;
+                                        break;
+                                }
+                        }
                         imux->num_items = i + 1;
+                }
         }
         spec->num_mux_defs = 1;
         spec->input_mux = imux;
@@ -1957,10 +1973,8 @@ static int alc_build_controls(struct hda_codec *codec)
                 if (!kctl)
                         kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
                 for (i = 0; kctl && i < kctl->count; i++) {
-                        const hda_nid_t *nids = spec->capsrc_nids;
-                        if (!nids)
-                                nids = spec->adc_nids;
-                        err = snd_hda_add_nid(codec, kctl, i, nids[i]);
+                        err = snd_hda_add_nid(codec, kctl, i,
+                                              get_capsrc(spec, i));
                         if (err < 0)
                                 return err;
                 }
@@ -2747,8 +2761,7 @@ static int alc_auto_create_input_ctls(struct hda_codec *codec)
                 }
 
                 for (c = 0; c < num_adcs; c++) {
-                        hda_nid_t cap = spec->capsrc_nids ?
-                                spec->capsrc_nids[c] : spec->adc_nids[c];
+                        hda_nid_t cap = get_capsrc(spec, c);
                         idx = get_connection_index(codec, cap, pin);
                         if (idx >= 0) {
                                 spec->imux_pins[imux->num_items] = pin;
@@ -3694,8 +3707,7 @@ static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)
         if (!pin)
                 return 0;
         for (i = 0; i < spec->num_adc_nids; i++) {
-                hda_nid_t cap = spec->capsrc_nids ?
-                        spec->capsrc_nids[i] : spec->adc_nids[i];
+                hda_nid_t cap = get_capsrc(spec, i);
                 int idx;
 
                 idx = get_connection_index(codec, cap, pin);
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 470f6f286e81..d8d2f9dccd9b 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1641,6 +1641,8 @@ static const struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
                       "Alienware M17x", STAC_ALIENWARE_M17X),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,
                       "Alienware M17x", STAC_ALIENWARE_M17X),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,
+                      "Alienware M17x", STAC_ALIENWARE_M17X),
         {} /* terminator */
 };
 
@@ -4439,7 +4441,9 @@ static int stac92xx_init(struct hda_codec *codec)
                 int pinctl, def_conf;
 
                 /* power on when no jack detection is available */
-                if (!spec->hp_detect) {
+                /* or when the VREF is used for controlling LED */
+                if (!spec->hp_detect ||
+                    (spec->gpio_led > 8 && spec->gpio_led == nid)) {
                         stac_toggle_power_map(codec, nid, 1);
                         continue;
                 }
@@ -5053,20 +5057,6 @@ static int stac92xx_pre_resume(struct hda_codec *codec)
         return 0;
 }
 
-static int stac92xx_post_suspend(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        if (spec->gpio_led > 8) {
-                /* with vref-out pin used for mute led control
-                 * codec AFG is prevented from D3 state, but on
-                 * system suspend it can (and should) be used
-                 */
-                snd_hda_codec_read(codec, codec->afg, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-        }
-        return 0;
-}
-
 static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,
                                 unsigned int power_state)
 {
@@ -5666,8 +5656,6 @@ again:
                 } else {
                         codec->patch_ops.set_power_state =
                                         stac92xx_set_power_state;
-                        codec->patch_ops.post_suspend =
-                                        stac92xx_post_suspend;
                 }
                 codec->patch_ops.pre_resume = stac92xx_pre_resume;
                 codec->patch_ops.check_power_status =
@@ -5981,8 +5969,6 @@ again:
                 } else {
                         codec->patch_ops.set_power_state =
                                         stac92xx_set_power_state;
-                        codec->patch_ops.post_suspend =
-                                        stac92xx_post_suspend;
                 }
                 codec->patch_ops.pre_resume = stac92xx_pre_resume;
                 codec->patch_ops.check_power_status =
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 431c0d417eeb..b5137629f8e9 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -208,6 +208,7 @@ struct via_spec {
         /* work to check hp jack state */
         struct hda_codec *codec;
         struct delayed_work vt1708_hp_work;
+        int hp_work_active;
         int vt1708_jack_detect;
         int vt1708_hp_present;
 
@@ -305,27 +306,35 @@ enum {
 static void analog_low_current_mode(struct hda_codec *codec);
 static bool is_aa_path_mute(struct hda_codec *codec);
 
-static void vt1708_start_hp_work(struct via_spec *spec)
+#define hp_detect_with_aa(codec) \
+        (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1 && \
+         !is_aa_path_mute(codec))
+
+static void vt1708_stop_hp_work(struct via_spec *spec)
 {
         if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)
                 return;
-        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
-                            !spec->vt1708_jack_detect);
-        if (!delayed_work_pending(&spec->vt1708_hp_work))
-                schedule_delayed_work(&spec->vt1708_hp_work,
-                                      msecs_to_jiffies(100));
+        if (spec->hp_work_active) {
+                snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81, 1);
+                cancel_delayed_work_sync(&spec->vt1708_hp_work);
+                spec->hp_work_active = 0;
+        }
 }
 
-static void vt1708_stop_hp_work(struct via_spec *spec)
+static void vt1708_update_hp_work(struct via_spec *spec)
 {
         if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)
                 return;
-        if (snd_hda_get_bool_hint(spec->codec, "analog_loopback_hp_detect") == 1
-            && !is_aa_path_mute(spec->codec))
-                return;
-        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
-                            !spec->vt1708_jack_detect);
-        cancel_delayed_work_sync(&spec->vt1708_hp_work);
+        if (spec->vt1708_jack_detect &&
+            (spec->active_streams || hp_detect_with_aa(spec->codec))) {
+                if (!spec->hp_work_active) {
+                        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81, 0);
+                        schedule_delayed_work(&spec->vt1708_hp_work,
+                                              msecs_to_jiffies(100));
+                        spec->hp_work_active = 1;
+                }
+        } else if (!hp_detect_with_aa(spec->codec))
+                vt1708_stop_hp_work(spec);
 }
 
 static void set_widgets_power_state(struct hda_codec *codec)
@@ -343,12 +352,7 @@ static int analog_input_switch_put(struct snd_kcontrol *kcontrol,
 
         set_widgets_power_state(codec);
         analog_low_current_mode(snd_kcontrol_chip(kcontrol));
-        if (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1) {
-                if (is_aa_path_mute(codec))
-                        vt1708_start_hp_work(codec->spec);
-                else
-                        vt1708_stop_hp_work(codec->spec);
-        }
+        vt1708_update_hp_work(codec->spec);
         return change;
 }
 
@@ -1154,7 +1158,7 @@ static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo,
         spec->cur_dac_stream_tag = stream_tag;
         spec->cur_dac_format = format;
         mutex_unlock(&spec->config_mutex);
-        vt1708_start_hp_work(spec);
+        vt1708_update_hp_work(spec);
         return 0;
 }
 
@@ -1174,7 +1178,7 @@ static int via_playback_hp_pcm_prepare(struct hda_pcm_stream *hinfo,
         spec->cur_hp_stream_tag = stream_tag;
         spec->cur_hp_format = format;
         mutex_unlock(&spec->config_mutex);
-        vt1708_start_hp_work(spec);
+        vt1708_update_hp_work(spec);
         return 0;
 }
 
@@ -1188,7 +1192,7 @@ static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo,
         snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
         spec->active_streams &= ~STREAM_MULTI_OUT;
         mutex_unlock(&spec->config_mutex);
-        vt1708_stop_hp_work(spec);
+        vt1708_update_hp_work(spec);
         return 0;
 }
 
@@ -1203,7 +1207,7 @@ static int via_playback_hp_pcm_cleanup(struct hda_pcm_stream *hinfo,
                 snd_hda_codec_setup_stream(codec, spec->hp_dac_nid, 0, 0, 0);
         spec->active_streams &= ~STREAM_INDEP_HP;
         mutex_unlock(&spec->config_mutex);
-        vt1708_stop_hp_work(spec);
+        vt1708_update_hp_work(spec);
         return 0;
 }
 
@@ -1645,7 +1649,8 @@ static void via_hp_automute(struct hda_codec *codec)
         int nums;
         struct via_spec *spec = codec->spec;
 
-        if (!spec->hp_independent_mode && spec->autocfg.hp_pins[0])
+        if (!spec->hp_independent_mode && spec->autocfg.hp_pins[0] &&
+            (spec->codec_type != VT1708 || spec->vt1708_jack_detect))
                 present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
 
         if (spec->smart51_enabled)
@@ -2612,8 +2617,6 @@ static int vt1708_jack_detect_get(struct snd_kcontrol *kcontrol,
 
         if (spec->codec_type != VT1708)
                 return 0;
-        spec->vt1708_jack_detect =
-                !((snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8) & 0x1);
         ucontrol->value.integer.value[0] = spec->vt1708_jack_detect;
         return 0;
 }
@@ -2623,18 +2626,22 @@ static int vt1708_jack_detect_put(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
-        int change;
+        int val;
 
         if (spec->codec_type != VT1708)
                 return 0;
-        spec->vt1708_jack_detect = ucontrol->value.integer.value[0];
-        change = (0x1 & (snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8))
-                == !spec->vt1708_jack_detect;
-        if (spec->vt1708_jack_detect) {
+        val = !!ucontrol->value.integer.value[0];
+        if (spec->vt1708_jack_detect == val)
+                return 0;
+        spec->vt1708_jack_detect = val;
+        if (spec->vt1708_jack_detect &&
+            snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") != 1) {
                 mute_aa_path(codec, 1);
                 notify_aa_path_ctls(codec);
         }
-        return change;
+        via_hp_automute(codec);
+        vt1708_update_hp_work(spec);
+        return 1;
 }
 
 static const struct snd_kcontrol_new vt1708_jack_detect_ctl = {
@@ -2771,6 +2778,7 @@ static int via_init(struct hda_codec *codec)
         via_auto_init_unsol_event(codec);
 
         via_hp_automute(codec);
+        vt1708_update_hp_work(spec);
 
         return 0;
 }
@@ -2787,7 +2795,9 @@ static void vt1708_update_hp_jack_state(struct work_struct *work)
                 spec->vt1708_hp_present ^= 1;
                 via_hp_automute(spec->codec);
         }
-        vt1708_start_hp_work(spec);
+        if (spec->vt1708_jack_detect)
+                schedule_delayed_work(&spec->vt1708_hp_work,
+                                      msecs_to_jiffies(100));
 }
 
 static int get_mux_nids(struct hda_codec *codec)
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index e328cfb7620c..e525da2673be 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -68,8 +68,11 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
 
 static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
 {
-        /* we use pins 39 and 41 of the VT1616 for left and right read outputs */
-        snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
+        if (ice->ac97)
+                /* we use pins 39 and 41 of the VT1616 for left and right
+                read outputs */
+                snd_ac97_write_cache(ice->ac97, 0x5a,
+                        snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
         return 0;
 }
 
diff --git a/sound/pci/ice1712/envy24ht.h b/sound/pci/ice1712/envy24ht.h
index a0c5e009bb4a..4ca33a800bc8 100644
--- a/sound/pci/ice1712/envy24ht.h
+++ b/sound/pci/ice1712/envy24ht.h
@@ -66,6 +66,7 @@ enum {
 #define     VT1724_CFG_CLOCK384  0x40   /* 16.9344Mhz, 44.1kHz*384 */
 #define   VT1724_CFG_MPU401     0x20            /* MPU401 UARTs */
 #define   VT1724_CFG_ADC_MASK   0x0c    /* one, two or one and S/PDIF, stereo ADCs */
+#define   VT1724_CFG_ADC_NONE   0x0c    /* no ADCs */
 #define   VT1724_CFG_DAC_MASK   0x03    /* one, two, three, four stereo DACs */
 
 #define VT1724_REG_AC97_CFG             0x05    /* byte */
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 44446f2222d9..132a86e09d07 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -84,9 +84,9 @@ MODULE_SUPPORTED_DEVICE("{"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 static char *model[SNDRV_CARDS];
-static int omni[SNDRV_CARDS];                           /* Delta44 & 66 Omni I/O support */
+static bool omni[SNDRV_CARDS];                          /* Delta44 & 66 Omni I/O support */
 static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transceiver reset timeout value in msec */
 static int dxr_enable[SNDRV_CARDS];                     /* DXR enable for DMX6FIRE */
 
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 4353e76bf0a6..92362973764d 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -80,7 +80,7 @@ MODULE_SUPPORTED_DEVICE("{"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;              /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;             /* Enable this card */
 static char *model[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
@@ -1117,14 +1117,21 @@ static struct snd_pcm_ops snd_vt1724_capture_pro_ops = {
 static int __devinit snd_vt1724_pcm_profi(struct snd_ice1712 *ice, int device)
 {
         struct snd_pcm *pcm;
-        int err;
+        int capt, err;
 
-        err = snd_pcm_new(ice->card, "ICE1724", device, 1, 1, &pcm);
+        if ((ice->eeprom.data[ICE_EEP2_SYSCONF] & VT1724_CFG_ADC_MASK) ==
+            VT1724_CFG_ADC_NONE)
+                capt = 0;
+        else
+                capt = 1;
+        err = snd_pcm_new(ice->card, "ICE1724", device, 1, capt, &pcm);
         if (err < 0)
                 return err;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_vt1724_playback_pro_ops);
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_vt1724_capture_pro_ops);
+        if (capt)
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                        &snd_vt1724_capture_pro_ops);
 
         pcm->private_data = ice;
         pcm->info_flags = 0;
@@ -1825,7 +1832,12 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
 
-        uinfo->value.enumerated.items = hw_rates_count + ice->ext_clock_count;
+        /* internal clocks */
+        uinfo->value.enumerated.items = hw_rates_count;
+        /* external clocks */
+        if (ice->force_rdma1 ||
+            (ice->eeprom.data[ICE_EEP2_SPDIF] & VT1724_CFG_SPDIF_IN))
+                uinfo->value.enumerated.items += ice->ext_clock_count;
         /* upper limit - keep at top */
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
@@ -2173,6 +2185,40 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {
 
 static struct snd_ice1712_card_info no_matched __devinitdata;
 
+
+/*
+  ooAoo cards with no controls
+*/
+static unsigned char ooaoo_sq210_eeprom[] __devinitdata = {
+        [ICE_EEP2_SYSCONF]     = 0x4c,  /* 49MHz crystal, no mpu401, no ADC,
+                                           1xDACs */
+        [ICE_EEP2_ACLINK]      = 0x80,  /* I2S */
+        [ICE_EEP2_I2S]         = 0x78,  /* no volume, 96k, 24bit, 192k */
+        [ICE_EEP2_SPDIF]       = 0xc1,  /* out-en, out-int, out-ext */
+        [ICE_EEP2_GPIO_DIR]    = 0x00,  /* no GPIOs are used */
+        [ICE_EEP2_GPIO_DIR1]   = 0x00,
+        [ICE_EEP2_GPIO_DIR2]   = 0x00,
+        [ICE_EEP2_GPIO_MASK]   = 0xff,
+        [ICE_EEP2_GPIO_MASK1]  = 0xff,
+        [ICE_EEP2_GPIO_MASK2]  = 0xff,
+
+        [ICE_EEP2_GPIO_STATE]  = 0x00, /* inputs */
+        [ICE_EEP2_GPIO_STATE1] = 0x00, /* all 1, but GPIO_CPLD_RW
+                                          and GPIO15 always zero */
+        [ICE_EEP2_GPIO_STATE2] = 0x00, /* inputs */
+};
+
+
+struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] __devinitdata = {
+        {
+                .name = "ooAoo SQ210a",
+                .model = "sq210a",
+                .eeprom_size = sizeof(ooaoo_sq210_eeprom),
+                .eeprom_data = ooaoo_sq210_eeprom,
+        },
+        { } /* terminator */
+};
+
 static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
         snd_vt1724_revo_cards,
         snd_vt1724_amp_cards,
@@ -2187,6 +2233,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
         snd_vt1724_wtm_cards,
         snd_vt1724_se_cards,
         snd_vt1724_qtet_cards,
+        snd_vt1724_ooaoo_cards,
         NULL,
 };
 
@@ -2270,7 +2317,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
                 }
         }
         for (tbl = card_tables; *tbl; tbl++) {
-                for (c = *tbl; c->subvendor; c++) {
+                for (c = *tbl; c->name; c++) {
                         if (modelname && c->model &&
                             !strcmp(modelname, c->model)) {
                                 printk(KERN_INFO "ice1724: Using board model %s\n",
@@ -2579,8 +2626,10 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
         ice->ext_clock_count = 0;
 
         for (tbl = card_tables; *tbl; tbl++) {
-                for (c = *tbl; c->subvendor; c++) {
-                        if (c->subvendor == ice->eeprom.subvendor) {
+                for (c = *tbl; c->name; c++) {
+                        if ((model[dev] && c->model &&
+                             !strcmp(model[dev], c->model)) ||
+                            (c->subvendor == ice->eeprom.subvendor)) {
                                 strcpy(card->shortname, c->name);
                                 if (c->driver) /* specific driver? */
                                         strcpy(card->driver, c->driver);
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 11718b49b2e2..40b181bab930 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -79,9 +79,9 @@ static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
 static int ac97_clock;
 static char *ac97_quirk;
-static int buggy_semaphore;
+static bool buggy_semaphore;
 static int buggy_irq = -1; /* auto-check */
-static int xbox;
+static bool xbox;
 static int spdif_aclink = -1;
 static int inside_vm = -1;
 
@@ -105,7 +105,7 @@ module_param(inside_vm, bool, 0444);
 MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization.");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 static int joystick;
 module_param(joystick, int, 0444);
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 0f7041ec7ddc..d689913a61be 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -68,7 +68,7 @@ module_param(ac97_clock, int, 0444);
 MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 /*
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 841864b6b371..8fea45ab5882 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -408,7 +408,7 @@ MODULE_FIRMWARE("korg/k1212.dsp");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;          /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Korg 1212 soundcard.");
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 924168ef1ed6..375982736858 100644
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -35,7 +35,7 @@
 /* Standard options */
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram Lola driver.");
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 04ae84b2a107..d94c0c292bd0 100644
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -42,7 +42,7 @@ MODULE_SUPPORTED_DEVICE("{digigram lx6464es{}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram LX6464ES interface.");
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
index 5c8717e29eeb..8c3e7fcefd99 100644
--- a/sound/pci/lx6464es/lx_core.c
+++ b/sound/pci/lx6464es/lx_core.c
@@ -78,10 +78,15 @@ unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port)
         return ioread32(address);
 }
 
-void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len)
+static void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data,
+                               u32 len)
 {
-        void __iomem *address = lx_dsp_register(chip, port);
-        memcpy_fromio(data, address, len*sizeof(u32));
+        u32 __iomem *address = lx_dsp_register(chip, port);
+        int i;
+
+        /* we cannot use memcpy_fromio */
+        for (i = 0; i != len; ++i)
+                data[i] = ioread32(address + i);
 }
 
 
@@ -91,11 +96,15 @@ void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data)
         iowrite32(data, address);
 }
 
-void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data,
-                         u32 len)
+static void lx_dsp_reg_writebuf(struct lx6464es *chip, int port,
+                                const u32 *data, u32 len)
 {
-        void __iomem *address = lx_dsp_register(chip, port);
-        memcpy_toio(address, data, len*sizeof(u32));
+        u32 __iomem *address = lx_dsp_register(chip, port);
+        int i;
+
+        /* we cannot use memcpy_to */
+        for (i = 0; i != len; ++i)
+                iowrite32(data[i], address + i);
 }
 
 
diff --git a/sound/pci/lx6464es/lx_core.h b/sound/pci/lx6464es/lx_core.h
index 1dd562980b6c..4d7ff797a646 100644
--- a/sound/pci/lx6464es/lx_core.h
+++ b/sound/pci/lx6464es/lx_core.h
@@ -72,10 +72,7 @@ enum {
 };
 
 unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port);
-void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len);
 void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data);
-void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data,
-                         u32 len);
 
 /* plx register access */
 enum {
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 863c8bdaecd6..78229b0dad2b 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -64,8 +64,8 @@ MODULE_FIRMWARE("ess/maestro3_assp_minisrc.fw");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
-static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
+static bool external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 static int amp_gpio[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index a0bd1d99793f..487837c01c9f 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -49,7 +49,7 @@ MODULE_SUPPORTED_DEVICE("{{Digigram," CARD_NAME "}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;             /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;              /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram " CARD_NAME " soundcard.");
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index c6c45d979f7a..ade2c64bd606 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -57,12 +57,12 @@ static int index = SNDRV_DEFAULT_IDX1;	/* Index */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
 static int playback_bufsize = 16;
 static int capture_bufsize = 16;
-static int force_ac97;                  /* disabled as default */
+static bool force_ac97;                 /* disabled as default */
 static int buffer_top;                  /* not specified */
-static int use_cache;                   /* disabled */
-static int vaio_hack;                   /* disabled */
-static int reset_workaround;
-static int reset_workaround_2;
+static bool use_cache;                  /* disabled */
+static bool vaio_hack;                  /* disabled */
+static bool reset_workaround;
+static bool reset_workaround_2;
 
 module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
@@ -86,7 +86,7 @@ module_param(reset_workaround_2, bool, 0444);
 MODULE_PARM_DESC(reset_workaround_2, "Enable extended AC97 RESET workaround for some other laptops.");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 5f3a13d4369d..eab663eef117 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -74,7 +74,7 @@ MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8786}"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "card index");
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 4149a0cb8b73..3fdee4950174 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -32,7 +32,7 @@ MODULE_SUPPORTED_DEVICE("{{Asus,AV66},{Asus,AV100},{Asus,AV200}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "card index");
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index 252719101c42..c8febf4b9bd6 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -418,6 +418,7 @@ static const struct oxygen_model model_xonar_d1 = {
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_2 |
+                         CAPTURE_1_FROM_SPDIF |
                          AC97_FMIC_SWITCH,
         .dac_channels_pcm = 8,
         .dac_channels_mixer = 8,
diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c
index bc6eb58be380..793bdf03d7e0 100644
--- a/sound/pci/oxygen/xonar_dg.c
+++ b/sound/pci/oxygen/xonar_dg.c
@@ -597,7 +597,8 @@ struct oxygen_model model_xonar_dg = {
         .model_data_size = sizeof(struct dg),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
+                         CAPTURE_0_FROM_I2S_2 |
+                         CAPTURE_1_FROM_SPDIF,
         .dac_channels_pcm = 6,
         .dac_channels_mixer = 0,
         .function_flags = OXYGEN_FUNCTION_SPI,
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 42d1ab136217..478303e6c2b0 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -1274,7 +1274,8 @@ static const struct oxygen_model model_xonar_ds = {
         .model_data_size = sizeof(struct xonar_wm87x6),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_1,
+                         CAPTURE_0_FROM_I2S_1 |
+                         CAPTURE_1_FROM_SPDIF,
         .dac_channels_pcm = 8,
         .dac_channels_mixer = 8,
         .dac_volume_min = 255 - 2*60,
@@ -1306,7 +1307,8 @@ static const struct oxygen_model model_xonar_hdav_slim = {
         .model_data_size = sizeof(struct xonar_wm87x6),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_1,
+                         CAPTURE_0_FROM_I2S_1 |
+                         CAPTURE_1_FROM_SPDIF,
         .dac_channels_pcm = 8,
         .dac_channels_mixer = 2,
         .dac_volume_min = 255 - 2*60,
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 56a52659742d..fd1809ab73b4 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -52,8 +52,8 @@ MODULE_SUPPORTED_DEVICE("{{Digigram," DRIVER_NAME "}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
-static int mono[SNDRV_CARDS];                           /* capture  mono only */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+static bool mono[SNDRV_CARDS];                          /* capture  mono only */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram " DRIVER_NAME " soundcard");
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index dcbedd33a629..0481d94aac9b 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -122,7 +122,7 @@ MODULE_FIRMWARE("riptide.hex");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;
 
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS - 1)] = 0x200 };
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 21bcb47fab50..b4819d5e41db 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -89,8 +89,8 @@
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int fullduplex[SNDRV_CARDS]; // = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool fullduplex[SNDRV_CARDS]; // = {[0 ... (SNDRV_CARDS - 1)] = 1};
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME Digi32 soundcard.");
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 4585c9729fea..ba894158e76c 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -53,7 +53,7 @@ MODULE_SUPPORTED_DEVICE("{{RME,Digi96},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME Digi96 soundcard.");
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index f2a3758dac52..b68cdec03b9e 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -45,7 +45,7 @@
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME Hammerfall DSP interface.");
@@ -2640,8 +2640,7 @@ static int snd_hdsp_info_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd
                 uinfo->value.enumerated.items = 3;
                 break;
         default:
-                uinfo->value.enumerated.items = 0;
-                break;
+                return -EINVAL;
         }
 
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index e760adad9523..cc9f6c83d661 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -61,7 +61,7 @@
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;        /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;         /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME HDSPM interface.");
@@ -941,6 +941,8 @@ struct hdspm {
 
         cycles_t last_interrupt;
 
+        unsigned int serial;
+
         struct hdspm_peak_rms peak_rms;
 };
 
@@ -4694,7 +4696,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
 
         snd_iprintf(buffer, "HW Serial: 0x%06x%06x\n",
                         (hdspm_read(hdspm, HDSPM_midiStatusIn1)>>8) & 0xFFFFFF,
-                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
+                        hdspm->serial);
 
         snd_iprintf(buffer, "IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n",
                         hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
@@ -6266,8 +6268,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
                 hdspm_version.card_type = hdspm->io_type;
                 strncpy(hdspm_version.cardname, hdspm->card_name,
                                 sizeof(hdspm_version.cardname));
-                hdspm_version.serial = (hdspm_read(hdspm,
-                                        HDSPM_midiStatusIn0)>>8) & 0xFFFFFF;
+                hdspm_version.serial = hdspm->serial;
                 hdspm_version.firmware_rev = hdspm->firmware_rev;
                 hdspm_version.addons = 0;
                 if (hdspm->tco)
@@ -6518,7 +6519,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
                         hdspm->io_type = AES32;
                         hdspm->card_name = "RME AES32";
                         hdspm->midiPorts = 2;
-                } else if ((hdspm->firmware_rev == 0xd5) ||
+                } else if ((hdspm->firmware_rev == 0xd2) ||
                         ((hdspm->firmware_rev >= 0xc8)  &&
                                 (hdspm->firmware_rev <= 0xcf))) {
                         hdspm->io_type = MADI;
@@ -6782,6 +6783,25 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         tasklet_init(&hdspm->midi_tasklet,
                         hdspm_midi_tasklet, (unsigned long) hdspm);
 
+
+        if (hdspm->io_type != MADIface) {
+                hdspm->serial = (hdspm_read(hdspm,
+                                HDSPM_midiStatusIn0)>>8) & 0xFFFFFF;
+                /* id contains either a user-provided value or the default
+                 * NULL. If it's the default, we're safe to
+                 * fill card->id with the serial number.
+                 *
+                 * If the serial number is 0xFFFFFF, then we're dealing with
+                 * an old PCI revision that comes without a sane number. In
+                 * this case, we don't set card->id to avoid collisions
+                 * when running with multiple cards.
+                 */
+                if (NULL == id[hdspm->dev] && hdspm->serial != 0xFFFFFF) {
+                        sprintf(card->id, "HDSPMx%06x", hdspm->serial);
+                        snd_card_set_id(card, card->id);
+                }
+        }
+
         snd_printdd("create alsa devices.\n");
         err = snd_hdspm_create_alsa_devices(card, hdspm);
         if (err < 0)
@@ -6868,10 +6888,10 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
         if (hdspm->io_type != MADIface) {
                 sprintf(card->shortname, "%s_%x",
                         hdspm->card_name,
-                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
+                        hdspm->serial);
                 sprintf(card->longname, "%s S/N 0x%x at 0x%lx, irq %d",
                         hdspm->card_name,
-                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF,
+                        hdspm->serial,
                         hdspm->port, hdspm->irq);
         } else {
                 sprintf(card->shortname, "%s", hdspm->card_name);
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 732c5e837437..b737d1619cc7 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -38,8 +38,8 @@
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int precise_ptr[SNDRV_CARDS];                    /* Enable precise pointer */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool precise_ptr[SNDRV_CARDS];                   /* Enable precise pointer */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME Digi9652 (Hammerfall) soundcard.");
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index a391e622a192..ff500a87f769 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -40,7 +40,8 @@ MODULE_SUPPORTED_DEVICE("{{SiS,SiS7019 Audio Accelerator}}");
 
 static int index = SNDRV_DEFAULT_IDX1;  /* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
-static int enable = 1;
+static bool enable = 1;
+static int codecs = 1;
 
 module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for SiS7019 Audio Accelerator.");
@@ -48,6 +49,8 @@ module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for SiS7019 Audio Accelerator.");
 module_param(enable, bool, 0444);
 MODULE_PARM_DESC(enable, "Enable SiS7019 Audio Accelerator.");
+module_param(codecs, int, 0444);
+MODULE_PARM_DESC(codecs, "Set bit to indicate that codec number is expected to be present (default 1)");
 
 static DEFINE_PCI_DEVICE_TABLE(snd_sis7019_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x7019) },
@@ -140,6 +143,9 @@ struct sis7019 {
         dma_addr_t silence_dma_addr;
 };
 
+/* These values are also used by the module param 'codecs' to indicate
+ * which codecs should be present.
+ */
 #define SIS_PRIMARY_CODEC_PRESENT       0x0001
 #define SIS_SECONDARY_CODEC_PRESENT     0x0002
 #define SIS_TERTIARY_CODEC_PRESENT      0x0004
@@ -977,7 +983,7 @@ timeout:
         mutex_unlock(&sis->ac97_mutex);
 
         if (!count) {
-                printk(KERN_ERR "sis7019: ac97 codec %d timeout cmd 0x%08x\n",
+                dev_err(&sis->pci->dev, "ac97 codec %d timeout cmd 0x%08x\n",
                                         codec, cmd);
         }
 
@@ -1078,6 +1084,7 @@ static int sis_chip_init(struct sis7019 *sis)
 {
         unsigned long io = sis->ioport;
         void __iomem *ioaddr = sis->ioaddr;
+        unsigned long timeout;
         u16 status;
         int count;
         int i;
@@ -1104,21 +1111,45 @@ static int sis_chip_init(struct sis7019 *sis)
         while ((inw(io + SIS_AC97_STATUS) & SIS_AC97_STATUS_BUSY) && --count)
                 udelay(1);
 
+        /* Command complete, we can let go of the semaphore now.
+         */
+        outl(SIS_AC97_SEMA_RELEASE, io + SIS_AC97_SEMA);
+        if (!count)
+                return -EIO;
+
         /* Now that we've finished the reset, find out what's attached.
+         * There are some codec/board combinations that take an extremely
+         * long time to come up. 350+ ms has been observed in the field,
+         * so we'll give them up to 500ms.
          */
-        status = inl(io + SIS_AC97_STATUS);
-        if (status & SIS_AC97_STATUS_CODEC_READY)
-                sis->codecs_present |= SIS_PRIMARY_CODEC_PRESENT;
-        if (status & SIS_AC97_STATUS_CODEC2_READY)
-                sis->codecs_present |= SIS_SECONDARY_CODEC_PRESENT;
-        if (status & SIS_AC97_STATUS_CODEC3_READY)
-                sis->codecs_present |= SIS_TERTIARY_CODEC_PRESENT;
-
-        /* All done, let go of the semaphore, and check for errors
+        sis->codecs_present = 0;
+        timeout = msecs_to_jiffies(500) + jiffies;
+        while (time_before_eq(jiffies, timeout)) {
+                status = inl(io + SIS_AC97_STATUS);
+                if (status & SIS_AC97_STATUS_CODEC_READY)
+                        sis->codecs_present |= SIS_PRIMARY_CODEC_PRESENT;
+                if (status & SIS_AC97_STATUS_CODEC2_READY)
+                        sis->codecs_present |= SIS_SECONDARY_CODEC_PRESENT;
+                if (status & SIS_AC97_STATUS_CODEC3_READY)
+                        sis->codecs_present |= SIS_TERTIARY_CODEC_PRESENT;
+
+                if (sis->codecs_present == codecs)
+                        break;
+
+                msleep(1);
+        }
+
+        /* All done, check for errors.
          */
-        outl(SIS_AC97_SEMA_RELEASE, io + SIS_AC97_SEMA);
-        if (!sis->codecs_present || !count)
+        if (!sis->codecs_present) {
+                dev_err(&sis->pci->dev, "could not find any codecs\n");
                 return -EIO;
+        }
+
+        if (sis->codecs_present != codecs) {
+                dev_warn(&sis->pci->dev, "missing codecs, found %0x, expected %0x\n",
+                                         sis->codecs_present, codecs);
+        }
 
         /* Let the hardware know that the audio driver is alive,
          * and enable PCM slots on the AC-link for L/R playback (3 & 4) and
@@ -1225,18 +1256,18 @@ static int sis_resume(struct pci_dev *pci)
         pci_restore_state(pci);
 
         if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "sis7019: unable to re-enable device\n");
+                dev_err(&pci->dev, "unable to re-enable device\n");
                 goto error;
         }
 
         if (sis_chip_init(sis)) {
-                printk(KERN_ERR "sis7019: unable to re-init controller\n");
+                dev_err(&pci->dev, "unable to re-init controller\n");
                 goto error;
         }
 
         if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED,
                         KBUILD_MODNAME, sis)) {
-                printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq);
+                dev_err(&pci->dev, "unable to regain IRQ %d\n", pci->irq);
                 goto error;
         }
 
@@ -1304,8 +1335,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
                 goto error_out;
 
         if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
-                printk(KERN_ERR "sis7019: architecture does not support "
-                                        "30-bit PCI busmaster DMA");
+                dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA");
                 goto error_out_enabled;
         }
 
@@ -1319,20 +1349,20 @@ static int __devinit sis_chip_create(struct snd_card *card,
 
         rc = pci_request_regions(pci, "SiS7019");
         if (rc) {
-                printk(KERN_ERR "sis7019: unable request regions\n");
+                dev_err(&pci->dev, "unable request regions\n");
                 goto error_out_enabled;
         }
 
         rc = -EIO;
         sis->ioaddr = ioremap_nocache(pci_resource_start(pci, 1), 0x4000);
         if (!sis->ioaddr) {
-                printk(KERN_ERR "sis7019: unable to remap MMIO, aborting\n");
+                dev_err(&pci->dev, "unable to remap MMIO, aborting\n");
                 goto error_out_cleanup;
         }
 
         rc = sis_alloc_suspend(sis);
         if (rc < 0) {
-                printk(KERN_ERR "sis7019: unable to allocate state storage\n");
+                dev_err(&pci->dev, "unable to allocate state storage\n");
                 goto error_out_cleanup;
         }
 
@@ -1340,9 +1370,9 @@ static int __devinit sis_chip_create(struct snd_card *card,
         if (rc)
                 goto error_out_cleanup;
 
-        if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, sis)) {
-                printk(KERN_ERR "unable to allocate irq %d\n", sis->irq);
+        if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, KBUILD_MODNAME,
+                        sis)) {
+                dev_err(&pci->dev, "unable to allocate irq %d\n", sis->irq);
                 goto error_out_cleanup;
         }
 
@@ -1390,6 +1420,17 @@ static int __devinit snd_sis7019_probe(struct pci_dev *pci,
         if (!enable)
                 goto error_out;
 
+        /* The user can specify which codecs should be present so that we
+         * can wait for them to show up if they are slow to recover from
+         * the AC97 cold reset. We default to a single codec, the primary.
+         *
+         * We assume that SIS_PRIMARY_*_PRESENT matches bits 0-2.
+         */
+        codecs &= SIS_PRIMARY_CODEC_PRESENT | SIS_SECONDARY_CODEC_PRESENT |
+                  SIS_TERTIARY_CODEC_PRESENT;
+        if (!codecs)
+                codecs = SIS_PRIMARY_CODEC_PRESENT;
+
         rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card);
         if (rc < 0)
                 goto error_out;
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 31b6ad3ab1dc..54cc802050f7 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -52,9 +52,9 @@ MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int reverb[SNDRV_CARDS];
-static int mge[SNDRV_CARDS];
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool reverb[SNDRV_CARDS];
+static bool mge[SNDRV_CARDS];
 static unsigned int dmaio = 0x7a00;     /* DDMA i/o address */
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index deb04b924122..5f1def7f45e5 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -47,7 +47,7 @@ MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 32};
 static int wavetable_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8192};
 
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index ae98d56d05bd..75630408c6db 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -80,7 +80,7 @@ static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
 static long mpu_port;
 #ifdef SUPPORT_JOYSTICK
-static int joystick;
+static bool joystick;
 #endif
 static int ac97_clock = 48000;
 static char *ac97_quirk;
@@ -110,7 +110,7 @@ module_param(nodelay, int, 0444);
 MODULE_PARM_DESC(nodelay, "Disable 500ms init delay");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 80a9c2bf3301..5efcbcac506a 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -66,7 +66,7 @@ module_param(ac97_clock, int, 0444);
 MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
 
 /* just for backward compatibility */
-static int enable;
+static bool enable;
 module_param(enable, bool, 0444);
 
 
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 6765822fb3b7..6a534bfe1274 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -37,8 +37,8 @@ MODULE_SUPPORTED_DEVICE("{{Digigram," CARD_NAME "}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int mic[SNDRV_CARDS]; /* microphone */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static bool mic[SNDRV_CARDS]; /* microphone */
 static int ibl[SNDRV_CARDS]; /* microphone */
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e97ddcac0d37..e57b89e8aa89 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -41,13 +41,13 @@ MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724},"
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static long fm_port[SNDRV_CARDS];
 static long mpu_port[SNDRV_CARDS];
 #ifdef SUPPORT_JOYSTICK
 static long joystick_port[SNDRV_CARDS];
 #endif
-static int rear_switch[SNDRV_CARDS];
+static bool rear_switch[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard.");