diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-11-09 11:47:49 +0100 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2010-11-09 16:51:12 +0300 |
| commit | acc086837e49b44f15eff6007bb1726844df7aec (patch) | |
| tree | d41e096b545fc9c830fdd7c09f28c8ab975fa0d0 /hw/intel-hda.c | |
| parent | 17786d52acd3e18e77cd7e823f7d6bad9ece818e (diff) | |
| download | qemu-acc086837e49b44f15eff6007bb1726844df7aec.tar.gz | |
intel-hda: fix codec addressing.
The HDA bus supports up to 15 codecs, with addresses 0 ... 14.
We get that wrong in two places:
* When handing out addresses we accept address 15 as valid.
* The bitmasks for two registers (WAKEEN and STATESTS) don't
have bit 14 set.
This patch fixes it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw/intel-hda.c')
| -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 5e13dc35ed..b34b1408f2 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 = 0x3fff, + .wmask = 0x7fff, .offset = offsetof(IntelHDAState, wake_en), .whandler = intel_hda_set_wake_en, }, [ ICH6_REG_STATESTS ] = { .name = "STATESTS", .size = 2, - .wmask = 0x3fff, - .wclear = 0x3fff, + .wmask = 0x7fff, + .wclear = 0x7fff, .offset = offsetof(IntelHDAState, state_sts), .whandler = intel_hda_set_state_sts, }, |