diff options
| author | malc <av1474@comtv.ru> | 2010-11-09 19:14:15 +0300 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2010-11-09 19:14:15 +0300 |
| commit | e2553eb44e4ddd0b22124216d3dd20b6a0fecefb (patch) | |
| tree | 83f7f1770a690ce5e7306616b8d2362d11deae0b /hw | |
| parent | acc086837e49b44f15eff6007bb1726844df7aec (diff) | |
| download | qemu-e2553eb44e4ddd0b22124216d3dd20b6a0fecefb.zip qemu-e2553eb44e4ddd0b22124216d3dd20b6a0fecefb.tar.gz qemu-e2553eb44e4ddd0b22124216d3dd20b6a0fecefb.tar.bz2 | |
Revert "intel-hda: fix codec addressing."
Misses braces
This reverts commit acc086837e49b44f15eff6007bb1726844df7aec.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/intel-hda.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/intel-hda.c b/hw/intel-hda.c index b34b140..5e13dc3 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, }, |