summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-21 08:10:09 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-21 08:10:09 +0100
commit2f36f5e1ffcc18deee234b9085fabd2828f59ee0 (patch)
tree9968075598cd9073d53b1afb8c5676da01b49741 /sound
parentd2ebd4798744c401faf3fdc6493383912ccd0b80 (diff)
parentb8b1a4cb6842fb33769be1ad636f062d31d588c3 (diff)
downloadlinux-stable-2f36f5e1ffcc18deee234b9085fabd2828f59ee0.tar.gz
linux-stable-2f36f5e1ffcc18deee234b9085fabd2828f59ee0.tar.bz2
linux-stable-2f36f5e1ffcc18deee234b9085fabd2828f59ee0.zip
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ice1712/delta.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 7b62de089fee..20c6b079d0df 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -580,6 +580,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
{
int err;
struct snd_akm4xxx *ak;
+ unsigned char tmp;
if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DELTA1010 &&
ice->eeprom.gpiodir == 0x7b)
@@ -622,6 +623,12 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
break;
}
+ /* initialize the SPI clock to high */
+ tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);
+ tmp |= ICE1712_DELTA_AP_CCLK;
+ snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);
+ udelay(5);
+
/* initialize spdif */
switch (ice->eeprom.subvendor) {
case ICE1712_SUBDEVICE_AUDIOPHILE: