diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2000-08-13 09:08:19 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2000-08-13 09:08:19 +0000 |
| commit | 710591b7968585aa268a908e05440a9c9e3af5a4 (patch) | |
| tree | 2966801c002bddceeb2639460fdb1e074742bddf /sys/dev/ata/atapi-cd.c | |
| parent | 85aeb700f5eb3a31f14da50953bcc5c0c9a4d81d (diff) | |
Notes
Diffstat (limited to 'sys/dev/ata/atapi-cd.c')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index d36c2d119950..64325060eebe 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -489,7 +489,7 @@ acdopen(dev_t dev, int32_t flags, int32_t fmt, struct proc *p) if (track) { dev_t dev1 = makedev(major(dev), (dev->si_udev & 0xff0000ff)); - if (track < ((struct acd_softc *)(dev1->si_drv1))->toc.hdr.ending_track) + if (track <= ((struct acd_softc*)(dev1->si_drv1))->toc.hdr.ending_track) dev->si_drv1 = dev1->si_drv1; } @@ -1128,11 +1128,11 @@ acd_start(struct atapi_softc *atp) bzero(ccb, sizeof(ccb)); lba = bp->bio_offset / cdp->block_size; - track = ((bp->bio_dev->si_udev & 0x00ff0000) >> 16) - 1; + track = (bp->bio_dev->si_udev & 0x00ff0000) >> 16; if (track) { - lba += ntohl(cdp->toc.tab[track].addr.lba); - blocksize = (cdp->toc.tab[track].control & 4) ? 2048 : 2352; + lba += ntohl(cdp->toc.tab[track - 1].addr.lba); + blocksize = (cdp->toc.tab[track - 1].control & 4) ? 2048 : 2352; } else blocksize = cdp->block_size; |