diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.c | 1 | ||||
| -rw-r--r-- | hw/ide/macio.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index dd1912e80d..17f1cbd930 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs) ide_state->error = ABRT_ERR; ide_state->status = READY_STAT | ERR_STAT; ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag); + ncq_tfs->used = 0; } static void ncq_finish(NCQTransferState *ncq_tfs) diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 97712619cd..d4031b65e4 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -280,7 +280,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret) } /* Calculate current offset */ - offset = (int64_t)(s->lba << 11) + s->io_buffer_index; + offset = ((int64_t)s->lba << 11) + s->io_buffer_index; pmac_dma_read(s->blk, offset, io->len, pmac_ide_atapi_transfer_cb, io); return; |