]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - sound/pci/ice1712/ice1724.c
[ALSA] Fix synchronize_irq() bugs, redundancies
[karo-tx-linux.git] / sound / pci / ice1712 / ice1724.c
index 0b0bbb0d96b91f8626724b163e68a88838422832..13ea94f317cb816a817bfe4e80e2ea11a1026762 100644 (file)
@@ -22,7 +22,6 @@
  *
  */      
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "vt1720_mobo.h"
 #include "pontis.h"
 #include "prodigy192.h"
+#include "prodigy_hifi.h"
 #include "juli.h"
 #include "phase.h"
 #include "wtm.h"
+#include "se.h"
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
@@ -62,9 +63,11 @@ MODULE_SUPPORTED_DEVICE("{"
               VT1720_MOBO_DEVICE_DESC
               PONTIS_DEVICE_DESC
               PRODIGY192_DEVICE_DESC
+              PRODIGY_HIFI_DEVICE_DESC
               JULI_DEVICE_DESC
               PHASE_DEVICE_DESC
               WTM_DEVICE_DESC
+              SE_DEVICE_DESC
                "{VIA,VT1720},"
                "{VIA,VT1724},"
                "{ICEnsemble,Generic ICE1724},"
@@ -103,15 +106,19 @@ static unsigned int PRO_RATE_DEFAULT = 44100;
  *  Basic I/O
  */
  
+/*
+ *  default rates, default clock routines
+ */
+
 /* check whether the clock mode is spdif-in */
-static inline int is_spdif_master(struct snd_ice1712 *ice)
+static inline int stdclock_is_spdif_master(struct snd_ice1712 *ice)
 {
        return (inb(ICEMT1724(ice, RATE)) & VT1724_SPDIF_MASTER) ? 1 : 0;
 }
 
 static inline int is_pro_rate_locked(struct snd_ice1712 *ice)
 {
-       return is_spdif_master(ice) || PRO_RATE_LOCKED;
+       return ice->is_spdif_master(ice) || PRO_RATE_LOCKED;
 }
 
 /*
@@ -388,51 +395,61 @@ static int snd_vt1724_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 #define DMA_PAUSES     (VT1724_RDMA0_PAUSE|VT1724_PDMA0_PAUSE|VT1724_RDMA1_PAUSE|\
        VT1724_PDMA1_PAUSE|VT1724_PDMA2_PAUSE|VT1724_PDMA3_PAUSE|VT1724_PDMA4_PAUSE)
 
-static int get_max_rate(struct snd_ice1712 *ice)
+static const unsigned int stdclock_rate_list[16] = {
+       48000, 24000, 12000, 9600, 32000, 16000, 8000, 96000, 44100,
+       22050, 11025, 88200, 176400, 0, 192000, 64000
+};
+
+static unsigned int stdclock_get_rate(struct snd_ice1712 *ice)
+{
+       unsigned int rate;
+       rate = stdclock_rate_list[inb(ICEMT1724(ice, RATE)) & 15];
+       return rate;
+}
+
+static void stdclock_set_rate(struct snd_ice1712 *ice, unsigned int rate)
 {
+       int i;
+       for (i = 0; i < ARRAY_SIZE(stdclock_rate_list); i++) {
+               if (stdclock_rate_list[i] == rate) {
+                       outb(i, ICEMT1724(ice, RATE));
+                       return;
+               }
+       }
+}
+
+static unsigned char stdclock_set_mclk(struct snd_ice1712 *ice,
+                                      unsigned int rate)
+{
+       unsigned char val, old;
+       /* check MT02 */
        if (ice->eeprom.data[ICE_EEP2_ACLINK] & VT1724_CFG_PRO_I2S) {
-               if ((ice->eeprom.data[ICE_EEP2_I2S] & 0x08) && !ice->vt1720)
-                       return 192000;
+               val = old = inb(ICEMT1724(ice, I2S_FORMAT));
+               if (rate > 96000)
+                       val |= VT1724_MT_I2S_MCLK_128X; /* 128x MCLK */
                else
-                       return 96000;
-       } else
-               return 48000;
+                       val &= ~VT1724_MT_I2S_MCLK_128X; /* 256x MCLK */
+               if (val != old) {
+                       outb(val, ICEMT1724(ice, I2S_FORMAT));
+                       /* master clock changed */
+                       return 1;
+               }
+       }
+       /* no change in master clock */
+       return 0;
 }
 
 static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
                                    int force)
 {
        unsigned long flags;
-       unsigned char val, old;
-       unsigned int i, mclk_change;
+       unsigned char mclk_change;
+       unsigned int i, old_rate;
 
-       if (rate > get_max_rate(ice))
+       if (rate > ice->hw_rates->list[ice->hw_rates->count - 1])
                return;
-
-       switch (rate) {
-       case 8000: val = 6; break;
-       case 9600: val = 3; break;
-       case 11025: val = 10; break;
-       case 12000: val = 2; break;
-       case 16000: val = 5; break;
-       case 22050: val = 9; break;
-       case 24000: val = 1; break;
-       case 32000: val = 4; break;
-       case 44100: val = 8; break;
-       case 48000: val = 0; break;
-       case 64000: val = 15; break;
-       case 88200: val = 11; break;
-       case 96000: val = 7; break;
-       case 176400: val = 12; break;
-       case 192000: val = 14; break;
-       default:
-               snd_BUG();
-               val = 0;
-               break;
-       }
-
        spin_lock_irqsave(&ice->reg_lock, flags);
-       if ((inb(ICEMT1724(ice, DMA_CONTROL)) & DMA_STARTS) || 
+       if ((inb(ICEMT1724(ice, DMA_CONTROL)) & DMA_STARTS) ||
            (inb(ICEMT1724(ice, DMA_PAUSE)) & DMA_PAUSES)) {
                /* running? we cannot change the rate now... */
                spin_unlock_irqrestore(&ice->reg_lock, flags);
@@ -443,9 +460,9 @@ static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
                return;
        }
 
-       old = inb(ICEMT1724(ice, RATE));
-       if (force || old != val)
-               outb(val, ICEMT1724(ice, RATE));
+       old_rate = ice->get_rate(ice);
+       if (force || (old_rate != rate))
+               ice->set_rate(ice, rate);
        else if (rate == ice->cur_rate) {
                spin_unlock_irqrestore(&ice->reg_lock, flags);
                return;
@@ -453,19 +470,9 @@ static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
 
        ice->cur_rate = rate;
 
-       /* check MT02 */
-       mclk_change = 0;
-       if (ice->eeprom.data[ICE_EEP2_ACLINK] & VT1724_CFG_PRO_I2S) {
-               val = old = inb(ICEMT1724(ice, I2S_FORMAT));
-               if (rate > 96000)
-                       val |= VT1724_MT_I2S_MCLK_128X; /* 128x MCLK */
-               else
-                       val &= ~VT1724_MT_I2S_MCLK_128X; /* 256x MCLK */
-               if (val != old) {
-                       outb(val, ICEMT1724(ice, I2S_FORMAT));
-                       mclk_change = 1;
-               }
-       }
+       /* setting master clock */
+       mclk_change = ice->set_mclk(ice, rate);
+
        spin_unlock_irqrestore(&ice->reg_lock, flags);
 
        if (mclk_change && ice->gpio.i2s_mclk_changed)
@@ -724,43 +731,32 @@ static const struct snd_pcm_hardware snd_vt1724_2ch_stereo =
 /*
  * set rate constraints
  */
-static int set_rate_constraints(struct snd_ice1712 *ice,
-                               struct snd_pcm_substream *substream)
+static void set_std_hw_rates(struct snd_ice1712 *ice)
 {
-       struct snd_pcm_runtime *runtime = substream->runtime;
-       if (ice->hw_rates) {
-               /* hardware specific */
-               runtime->hw.rate_min = ice->hw_rates->list[0];
-               runtime->hw.rate_max = ice->hw_rates->list[ice->hw_rates->count - 1];
-               runtime->hw.rates = SNDRV_PCM_RATE_KNOT;
-               return snd_pcm_hw_constraint_list(runtime, 0,
-                                                 SNDRV_PCM_HW_PARAM_RATE,
-                                                 ice->hw_rates);
-       }
        if (ice->eeprom.data[ICE_EEP2_ACLINK] & VT1724_CFG_PRO_I2S) {
                /* I2S */
                /* VT1720 doesn't support more than 96kHz */
                if ((ice->eeprom.data[ICE_EEP2_I2S] & 0x08) && !ice->vt1720)
-                       return snd_pcm_hw_constraint_list(runtime, 0,
-                                                         SNDRV_PCM_HW_PARAM_RATE,
-                                                         &hw_constraints_rates_192);
-               else {
-                       runtime->hw.rates = SNDRV_PCM_RATE_KNOT |
-                               SNDRV_PCM_RATE_8000_96000;
-                       runtime->hw.rate_max = 96000;
-                       return snd_pcm_hw_constraint_list(runtime, 0,
-                                                         SNDRV_PCM_HW_PARAM_RATE,
-                                                         &hw_constraints_rates_96);
-               }
-       } else if (ice->ac97) {
+                       ice->hw_rates = &hw_constraints_rates_192;
+               else
+                       ice->hw_rates = &hw_constraints_rates_96;
+       } else {
                /* ACLINK */
-               runtime->hw.rate_max = 48000;
-               runtime->hw.rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000;
-               return snd_pcm_hw_constraint_list(runtime, 0,
-                                                 SNDRV_PCM_HW_PARAM_RATE,
-                                                 &hw_constraints_rates_48);
+               ice->hw_rates = &hw_constraints_rates_48;
        }
-       return 0;
+}
+
+static int set_rate_constraints(struct snd_ice1712 *ice,
+                               struct snd_pcm_substream *substream)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+
+       runtime->hw.rate_min = ice->hw_rates->list[0];
+       runtime->hw.rate_max = ice->hw_rates->list[ice->hw_rates->count - 1];
+       runtime->hw.rates = SNDRV_PCM_RATE_KNOT;
+       return snd_pcm_hw_constraint_list(runtime, 0,
+                                         SNDRV_PCM_HW_PARAM_RATE,
+                                         ice->hw_rates);
 }
 
 /* multi-channel playback needs alignment 8x32bit regardless of the channels
@@ -821,7 +817,7 @@ static int snd_vt1724_playback_pro_close(struct snd_pcm_substream *substream)
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        if (PRO_RATE_RESET)
-               snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 0);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 0);
        ice->playback_pro_substream = NULL;
 
        return 0;
@@ -832,7 +828,7 @@ static int snd_vt1724_capture_pro_close(struct snd_pcm_substream *substream)
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        if (PRO_RATE_RESET)
-               snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 0);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 0);
        ice->capture_pro_substream = NULL;
        return 0;
 }
@@ -967,6 +963,8 @@ static int snd_vt1724_playback_spdif_open(struct snd_pcm_substream *substream)
                                   VT1724_BUFFER_ALIGN);
        snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
                                   VT1724_BUFFER_ALIGN);
+       if (ice->spdif.ops.open)
+               ice->spdif.ops.open(ice, substream);
        return 0;
 }
 
@@ -975,8 +973,10 @@ static int snd_vt1724_playback_spdif_close(struct snd_pcm_substream *substream)
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        if (PRO_RATE_RESET)
-               snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 0);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 0);
        ice->playback_con_substream = NULL;
+       if (ice->spdif.ops.close)
+               ice->spdif.ops.close(ice, substream);
 
        return 0;
 }
@@ -999,6 +999,8 @@ static int snd_vt1724_capture_spdif_open(struct snd_pcm_substream *substream)
                                   VT1724_BUFFER_ALIGN);
        snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
                                   VT1724_BUFFER_ALIGN);
+       if (ice->spdif.ops.open)
+               ice->spdif.ops.open(ice, substream);
        return 0;
 }
 
@@ -1007,8 +1009,10 @@ static int snd_vt1724_capture_spdif_close(struct snd_pcm_substream *substream)
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        if (PRO_RATE_RESET)
-               snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 0);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 0);
        ice->capture_con_substream = NULL;
+       if (ice->spdif.ops.close)
+               ice->spdif.ops.close(ice, substream);
 
        return 0;
 }
@@ -1151,7 +1155,7 @@ static int snd_vt1724_playback_indep_close(struct snd_pcm_substream *substream)
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        if (PRO_RATE_RESET)
-               snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 0);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 0);
        ice->playback_con_substream_ds[substream->number] = NULL;
        ice->pcm_reserved[substream->number] = NULL;
 
@@ -1569,50 +1573,18 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol,
 static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
                                              struct snd_ctl_elem_info *uinfo)
 {
-       static const char * const texts_1724[] = {
-               "8000",         /* 0: 6 */
-               "9600",         /* 1: 3 */
-               "11025",        /* 2: 10 */
-               "12000",        /* 3: 2 */
-               "16000",        /* 4: 5 */
-               "22050",        /* 5: 9 */
-               "24000",        /* 6: 1 */
-               "32000",        /* 7: 4 */
-               "44100",        /* 8: 8 */
-               "48000",        /* 9: 0 */
-               "64000",        /* 10: 15 */
-               "88200",        /* 11: 11 */
-               "96000",        /* 12: 7 */
-               "176400",       /* 13: 12 */
-               "192000",       /* 14: 14 */
-               "IEC958 Input", /* 15: -- */
-       };
-       static const char * const texts_1720[] = {
-               "8000",         /* 0: 6 */
-               "9600",         /* 1: 3 */
-               "11025",        /* 2: 10 */
-               "12000",        /* 3: 2 */
-               "16000",        /* 4: 5 */
-               "22050",        /* 5: 9 */
-               "24000",        /* 6: 1 */
-               "32000",        /* 7: 4 */
-               "44100",        /* 8: 8 */
-               "48000",        /* 9: 0 */
-               "64000",        /* 10: 15 */
-               "88200",        /* 11: 11 */
-               "96000",        /* 12: 7 */
-               "IEC958 Input", /* 13: -- */
-       };
        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
 
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = 1;
-       uinfo->value.enumerated.items = ice->vt1720 ? 14 : 16;
+       uinfo->value.enumerated.items = ice->hw_rates->count + 1;
        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-       strcpy(uinfo->value.enumerated.name,
-              ice->vt1720 ? texts_1720[uinfo->value.enumerated.item] :
-              texts_1724[uinfo->value.enumerated.item]);
+       if (uinfo->value.enumerated.item == uinfo->value.enumerated.items - 1)
+               strcpy(uinfo->value.enumerated.name, "IEC958 Input");
+       else
+               sprintf(uinfo->value.enumerated.name, "%d",
+                       ice->hw_rates->list[uinfo->value.enumerated.item]);
        return 0;
 }
 
@@ -1620,68 +1592,79 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
-       static const unsigned char xlate[16] = {
-               9, 6, 3, 1, 7, 4, 0, 12, 8, 5, 2, 11, 13, 255, 14, 10
-       };
-       unsigned char val;
+       unsigned int i, rate;
        
        spin_lock_irq(&ice->reg_lock);
-       if (is_spdif_master(ice)) {
-               ucontrol->value.enumerated.item[0] = ice->vt1720 ? 13 : 15;
+       if (ice->is_spdif_master(ice)) {
+               ucontrol->value.enumerated.item[0] = ice->hw_rates->count;
        } else {
-               val = xlate[inb(ICEMT1724(ice, RATE)) & 15];
-               if (val == 255) {
-                       snd_BUG();
-                       val = 0;
+               rate = ice->get_rate(ice);
+               ucontrol->value.enumerated.item[0] = 0;
+               for (i = 0; i < ice->hw_rates->count; i++) {
+                       if (ice->hw_rates->list[i] == rate) {
+                               ucontrol->value.enumerated.item[0] = i;
+                               break;
+                       }
                }
-               ucontrol->value.enumerated.item[0] = val;
        }
        spin_unlock_irq(&ice->reg_lock);
        return 0;
 }
 
+/* setting clock to external - SPDIF */
+static void stdclock_set_spdif_clock(struct snd_ice1712 *ice)
+{
+       unsigned char oval;
+       unsigned char i2s_oval;
+       oval = inb(ICEMT1724(ice, RATE));
+       outb(oval | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
+       /* setting 256fs */
+       i2s_oval = inb(ICEMT1724(ice, I2S_FORMAT));
+       outb(i2s_oval & ~VT1724_MT_I2S_MCLK_128X, ICEMT1724(ice, I2S_FORMAT));
+}
+
 static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
-       unsigned char oval;
-       int rate;
-       int change = 0;
-       int spdif = ice->vt1720 ? 13 : 15;
+       unsigned int old_rate, new_rate;
+       unsigned int item = ucontrol->value.enumerated.item[0];
+       unsigned int spdif = ice->hw_rates->count;
+
+       if (item > spdif)
+               return -EINVAL;
 
        spin_lock_irq(&ice->reg_lock);
-       oval = inb(ICEMT1724(ice, RATE));
-       if (ucontrol->value.enumerated.item[0] == spdif) {
-               unsigned char i2s_oval;
-               outb(oval | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
-               /* setting 256fs */
-               i2s_oval = inb(ICEMT1724(ice, I2S_FORMAT));
-               outb(i2s_oval & ~VT1724_MT_I2S_MCLK_128X,
-                    ICEMT1724(ice, I2S_FORMAT));
+       if (ice->is_spdif_master(ice))
+               old_rate = 0;
+       else
+               old_rate = ice->get_rate(ice);
+       if (item == spdif) {
+               /* switching to external clock via SPDIF */
+               ice->set_spdif_clock(ice);
+               new_rate = 0;
        } else {
-               rate = rates[ucontrol->value.integer.value[0] % 15];
-               if (rate <= get_max_rate(ice)) {
-                       PRO_RATE_DEFAULT = rate;
-                       spin_unlock_irq(&ice->reg_lock);
-                       snd_vt1724_set_pro_rate(ice, PRO_RATE_DEFAULT, 1);
-                       spin_lock_irq(&ice->reg_lock);
-               }
+               /* internal on-card clock */
+               new_rate = ice->hw_rates->list[item];
+               ice->pro_rate_default = new_rate;
+               spin_unlock_irq(&ice->reg_lock);
+               snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1);
+               spin_lock_irq(&ice->reg_lock);
        }
-       change = inb(ICEMT1724(ice, RATE)) != oval;
        spin_unlock_irq(&ice->reg_lock);
 
-       if ((oval & VT1724_SPDIF_MASTER) !=
-           (inb(ICEMT1724(ice, RATE)) & VT1724_SPDIF_MASTER)) {
+       /* the first reset to the SPDIF master mode? */
+       if (old_rate != new_rate && !new_rate) {
                /* notify akm chips as well */
-               if (is_spdif_master(ice)) {
-                       unsigned int i;
-                       for (i = 0; i < ice->akm_codecs; i++) {
-                               if (ice->akm[i].ops.set_rate_val)
-                                       ice->akm[i].ops.set_rate_val(&ice->akm[i], 0);
-                       }
+               unsigned int i;
+               if (ice->gpio.set_pro_rate)
+                       ice->gpio.set_pro_rate(ice, 0);
+               for (i = 0; i < ice->akm_codecs; i++) {
+                       if (ice->akm[i].ops.set_rate_val)
+                               ice->akm[i].ops.set_rate_val(&ice->akm[i], 0);
                }
        }
-       return change;
+       return old_rate != new_rate;
 }
 
 static struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = {
@@ -1929,10 +1912,12 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
        snd_vt1724_aureon_cards,
        snd_vt1720_mobo_cards,
        snd_vt1720_pontis_cards,
+       snd_vt1724_prodigy_hifi_cards,
        snd_vt1724_prodigy192_cards,
        snd_vt1724_juli_cards,
        snd_vt1724_phase_cards,
        snd_vt1724_wtm_cards,
+       snd_vt1724_se_cards,
        NULL,
 };
 
@@ -1955,6 +1940,7 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice,
        unsigned char val;
 
        mutex_lock(&ice->i2c_mutex);
+       wait_i2c_busy(ice);
        outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR));
        outb(dev & ~VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR));
        wait_i2c_busy(ice);
@@ -2059,12 +2045,16 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
 
 
 
-static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice)
+static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice)
 {
        outb(VT1724_RESET , ICEREG1724(ice, CONTROL));
-       udelay(200);
+       msleep(10);
        outb(0, ICEREG1724(ice, CONTROL));
-       udelay(200);
+       msleep(10);
+}
+
+static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice)
+{
        outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG));
        outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG));
        outb(ice->eeprom.data[ICE_EEP2_I2S], ICEREG1724(ice, I2S_FEATURES));
@@ -2163,13 +2153,12 @@ static int snd_vt1724_free(struct snd_ice1712 *ice)
        outb(0xff, ICEREG1724(ice, IRQMASK));
        /* --- */
       __hw_end:
-       if (ice->irq >= 0) {
-               synchronize_irq(ice->irq);
+       if (ice->irq >= 0)
                free_irq(ice->irq, ice);
-       }
        pci_release_regions(ice->pci);
        snd_ice1712_akm4xxx_free(ice);
        pci_disable_device(ice->pci);
+       kfree(ice->spec);
        kfree(ice);
        return 0;
 }
@@ -2236,6 +2225,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
 
        ice->irq = pci->irq;
 
+       snd_vt1724_chip_reset(ice);
        if (snd_vt1724_read_eeprom(ice, modelname) < 0) {
                snd_vt1724_free(ice);
                return -EIO;
@@ -2328,6 +2318,19 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
         * was called so in ice1712 driver, and vt1724 driver is derived from
         * ice1712 driver.
         */
+       ice->pro_rate_default = PRO_RATE_DEFAULT;
+       if (!ice->is_spdif_master)
+               ice->is_spdif_master = stdclock_is_spdif_master;
+       if (!ice->get_rate)
+               ice->get_rate = stdclock_get_rate;
+       if (!ice->set_rate)
+               ice->set_rate = stdclock_set_rate;
+       if (!ice->set_mclk)
+               ice->set_mclk = stdclock_set_mclk;
+       if (!ice->set_spdif_clock)
+               ice->set_spdif_clock = stdclock_set_spdif_clock;
+       if (!ice->hw_rates)
+               set_std_hw_rates(ice);
 
        if ((err = snd_vt1724_pcm_profi(ice, pcm_dev++)) < 0) {
                snd_card_free(card);