2 files changed, 6 insertions, 19 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 11e791b965f6..c8d9178f47e5 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
         return 0;
 }
 
-static int azx_resume_early(struct pci_dev *pci)
-{
-        return pci_restore_state(pci);
-}
-
 static int azx_resume(struct pci_dev *pci)
 {
         struct snd_card *card = pci_get_drvdata(pci);
         struct azx *chip = card->private_data;
 
+        pci_set_power_state(pci, PCI_D0);
+        pci_restore_state(pci);
         if (pci_enable_device(pci) < 0) {
                 printk(KERN_ERR "hda-intel: pci_enable_device failed, "
                        "disabling device\n");
@@ -2468,7 +2465,6 @@ static struct pci_driver driver = {
         .remove = __devexit_p(azx_remove),
 #ifdef CONFIG_PM
         .suspend = azx_suspend,
-        .resume_early = azx_resume_early,
         .resume = azx_resume,
 #endif
 };
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 18c7c91786bc..6c870c12a177 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -26,7 +26,7 @@
  * SPI 0 -> 1st PCM1796 (front)
  * SPI 1 -> 2nd PCM1796 (surround)
  * SPI 2 -> 3rd PCM1796 (center/LFE)
- * SPI 4 -> 4th PCM1796 (back) and EEPROM self-destruct (do not use!)
+ * SPI 4 -> 4th PCM1796 (back)
  *
  * GPIO 2 -> M0 of CS5381
  * GPIO 3 -> M1 of CS5381
@@ -207,12 +207,6 @@ static void xonar_gpio_changed(struct oxygen *chip);
 static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
                                      u8 reg, u8 value)
 {
-        /*
-         * We don't want to do writes on SPI 4 because the EEPROM, which shares
-         * the same pin, might get confused and broken.  We'd better take care
-         * that the driver works with the default register values ...
-         */
-#if 0
         /* maps ALSA channel pair number to SPI output */
         static const u8 codec_map[4] = {
                 0, 1, 2, 4
@@ -223,7 +217,6 @@ static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
                          (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
                          (reg << 8) | value);
-#endif
 }
 
 static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec,
@@ -757,9 +750,6 @@ static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0);
 
 static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
 {
-        if (!strncmp(template->name, "Master Playback ", 16))
-                /* disable volume/mute because they would require SPI writes */
-                return 1;
         if (!strncmp(template->name, "CD Capture ", 11))
                 /* CD in is actually connected to the video in pin */
                 template->private_value ^= AC97_CD ^ AC97_VIDEO;
@@ -850,8 +840,9 @@ static const struct oxygen_model model_xonar_d2 = {
         .dac_volume_min = 0x0f,
         .dac_volume_max = 0xff,
         .misc_flags = OXYGEN_MISC_MIDI,
-        .function_flags = OXYGEN_FUNCTION_SPI,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
+        .function_flags = OXYGEN_FUNCTION_SPI |
+                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };