evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/hda' into topic/hda

Browse source
This commit is contained in:
Takashi Iwai 2012-05-15 08:58:49 +02:00
commit f153c6af87
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/pci/hda/hda_intel.c
View file

@ -789,11 +789,13 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
{ {
struct azx *chip = bus->private_data; struct azx *chip = bus->private_data;
unsigned long timeout; unsigned long timeout;
unsigned long loopcounter;
int do_poll = 0; int do_poll = 0;
again: again:
timeout = jiffies + msecs_to_jiffies(1000); timeout = jiffies + msecs_to_jiffies(1000);
for (;;) {
for (loopcounter = 0;; loopcounter++) {
if (chip->polling_mode || do_poll) { if (chip->polling_mode || do_poll) {
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
azx_update_rirb(chip); azx_update_rirb(chip);
@ -809,7 +811,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
} }
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout))
break; break;
if (bus->needs_damn_long_delay) if (bus->needs_damn_long_delay || loopcounter > 3000)
msleep(2); /* temporary workaround */ msleep(2); /* temporary workaround */
else { else {
udelay(10); udelay(10);

6
sound/pci/hda/patch_sigmatel.c
View file

@ -4390,9 +4390,9 @@ static int stac92xx_init(struct hda_codec *codec)
def_conf = get_defcfg_connect(def_conf); def_conf = get_defcfg_connect(def_conf);
/* skip any ports that don't have jacks since presence /* skip any ports that don't have jacks since presence
* detection is useless */ * detection is useless */
if (def_conf != AC_JACK_PORT_COMPLEX) { if (def_conf != AC_JACK_PORT_NONE &&
if (def_conf != AC_JACK_PORT_NONE) !is_jack_detectable(codec, nid)) {
stac_toggle_power_map(codec, nid, 1); stac_toggle_power_map(codec, nid, 1);
continue; continue;
} }
if (enable_pin_detect(codec, nid, STAC_PWR_EVENT)) { if (enable_pin_detect(codec, nid, STAC_PWR_EVENT)) {

2
sound/soc/sh/migor.c
View file

@ -35,7 +35,7 @@ static unsigned long siumckb_recalc(struct clk *clk)
return codec_freq; return codec_freq;
} }
static struct clk_ops siumckb_clk_ops = { static struct sh_clk_ops siumckb_clk_ops = {
.recalc = siumckb_recalc, .recalc = siumckb_recalc,
}; };