diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-04-04 20:07:46 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-04-04 20:07:46 +0000 |
| commit | db12181352581903b27272ae49611b1093b5edbb (patch) | |
| tree | 0c5e56ebf565ebab78f204c6581d75fbf37092c3 /sys/dev/pci/azalia.c | |
| parent | c48f41e0d724611470b757e418c715a08d756e7f (diff) | |
Reinitialize pins upon resume. Makes audio work after resume on machines
with codecs like the ALC269 that have pins that need to be configured but
don't have an associated mixer item.
ok jakemsr@
Diffstat (limited to 'sys/dev/pci/azalia.c')
| -rw-r--r-- | sys/dev/pci/azalia.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index b4cb0b2c90d..29e4e8a17e0 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.170 2010/04/03 14:40:09 kettenis Exp $ */ +/* $OpenBSD: azalia.c,v 1.171 2010/04/04 20:07:45 kettenis Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -1404,19 +1404,8 @@ azalia_resume_codec(codec_t *this) CORB_PS_D0, &result); DELAY(100); } - if ((w->type == COP_AWTYPE_PIN_COMPLEX) && - (w->d.pin.cap & COP_PINCAP_EAPD)) { - err = azalia_comresp(this, w->nid, - CORB_GET_EAPD_BTL_ENABLE, 0, &result); - if (err) - return err; - result &= 0xff; - result |= CORB_EAPD_EAPD; - err = azalia_comresp(this, w->nid, - CORB_SET_EAPD_BTL_ENABLE, result, &result); - if (err) - return err; - } + if (w->type == COP_AWTYPE_PIN_COMPLEX) + azalia_widget_init_pin(w, this); } if (this->qrks & AZ_QRK_GPIO_MASK) { |