Revert "intel-hda: fix codec addressing."
Misses braces
This reverts commit acc086837e
.
This commit is contained in:
parent
acc086837e
commit
e2553eb44e
|
@ -56,7 +56,7 @@ static int hda_codec_dev_init(DeviceState *qdev, DeviceInfo *base)
|
||||||
if (dev->cad == -1) {
|
if (dev->cad == -1) {
|
||||||
dev->cad = bus->next_cad;
|
dev->cad = bus->next_cad;
|
||||||
}
|
}
|
||||||
if (dev->cad >= 15)
|
if (dev->cad > 15)
|
||||||
return -1;
|
return -1;
|
||||||
bus->next_cad = dev->cad + 1;
|
bus->next_cad = dev->cad + 1;
|
||||||
return info->init(dev);
|
return info->init(dev);
|
||||||
|
@ -643,15 +643,15 @@ static const struct IntelHDAReg regtab[] = {
|
||||||
[ ICH6_REG_WAKEEN ] = {
|
[ ICH6_REG_WAKEEN ] = {
|
||||||
.name = "WAKEEN",
|
.name = "WAKEEN",
|
||||||
.size = 2,
|
.size = 2,
|
||||||
.wmask = 0x7fff,
|
.wmask = 0x3fff,
|
||||||
.offset = offsetof(IntelHDAState, wake_en),
|
.offset = offsetof(IntelHDAState, wake_en),
|
||||||
.whandler = intel_hda_set_wake_en,
|
.whandler = intel_hda_set_wake_en,
|
||||||
},
|
},
|
||||||
[ ICH6_REG_STATESTS ] = {
|
[ ICH6_REG_STATESTS ] = {
|
||||||
.name = "STATESTS",
|
.name = "STATESTS",
|
||||||
.size = 2,
|
.size = 2,
|
||||||
.wmask = 0x7fff,
|
.wmask = 0x3fff,
|
||||||
.wclear = 0x7fff,
|
.wclear = 0x3fff,
|
||||||
.offset = offsetof(IntelHDAState, state_sts),
|
.offset = offsetof(IntelHDAState, state_sts),
|
||||||
.whandler = intel_hda_set_state_sts,
|
.whandler = intel_hda_set_state_sts,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue