From: malc <av1474@comtv.ru>
Date: Tue, 9 Nov 2010 16:14:15 +0000 (+0300)
Subject: Revert "intel-hda: fix codec addressing."
X-Git-Tag: v0.14.0-rc0~474
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2553eb44e4ddd0b22124216d3dd20b6a0fecefb;p=thirdparty%2Fqemu.git

Revert "intel-hda: fix codec addressing."

Misses braces

This reverts commit acc086837e49b44f15eff6007bb1726844df7aec.
---

diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index b34b1408f20..5e13dc35ed5 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -56,7 +56,7 @@ static int hda_codec_dev_init(DeviceState *qdev, DeviceInfo *base)
     if (dev->cad == -1) {
         dev->cad = bus->next_cad;
     }
-    if (dev->cad >= 15)
+    if (dev->cad > 15)
         return -1;
     bus->next_cad = dev->cad + 1;
     return info->init(dev);
@@ -643,15 +643,15 @@ static const struct IntelHDAReg regtab[] = {
     [ ICH6_REG_WAKEEN ] = {
         .name     = "WAKEEN",
         .size     = 2,
-        .wmask    = 0x7fff,
+        .wmask    = 0x3fff,
         .offset   = offsetof(IntelHDAState, wake_en),
         .whandler = intel_hda_set_wake_en,
     },
     [ ICH6_REG_STATESTS ] = {
         .name     = "STATESTS",
         .size     = 2,
-        .wmask    = 0x7fff,
-        .wclear   = 0x7fff,
+        .wmask    = 0x3fff,
+        .wclear   = 0x3fff,
         .offset   = offsetof(IntelHDAState, state_sts),
         .whandler = intel_hda_set_state_sts,
     },