summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>2006-03-08 10:14:39 +0000
committersos <sos@FreeBSD.org>2006-03-08 10:14:39 +0000
commitd7b5daa52ed740b1a0bb702a3ed186627ed87a14 (patch)
tree3d70a6cde7835c0e5f415dc1663e2e218d0a1e78
parentd987f74f35d5b995297b06cf5476b706257868cb (diff)
downloadFreeBSD-src-d7b5daa52ed740b1a0bb702a3ed186627ed87a14.zip
FreeBSD-src-d7b5daa52ed740b1a0bb702a3ed186627ed87a14.tar.gz
Always read the TOC in acd_read_toc even if MEDIA_CHANGED wasn't set.
Since we cannot (reliably) detect when media has been removed before we try to touch it, this could leave stale TOC's around.
-rw-r--r--sys/dev/ata/atapi-cd.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 8a33330..cf7d159 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -940,9 +940,6 @@ acd_read_toc(device_t dev)
int8_t ccb[16];
int track, ntracks, len;
- if (!(atadev->flags & ATA_D_MEDIA_CHANGED))
- return;
-
atadev->flags &= ~ATA_D_MEDIA_CHANGED;
bzero(&cdp->toc, sizeof(cdp->toc));
cdp->disk_size = -1; /* hack for GEOM SOS */
OpenPOWER on IntegriCloud