summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>2001-09-06 09:50:25 +0000
committersos <sos@FreeBSD.org>2001-09-06 09:50:25 +0000
commitd2f14e461c5cffbdeeb5c7551c3ce498d4303b51 (patch)
treef66987dc46d9646e998cc4f50f956b2ad69aad40 /sys
parent3633cc3a37ea5a0e349ce4ebab457d502ea021ae (diff)
downloadFreeBSD-src-d2f14e461c5cffbdeeb5c7551c3ce498d4303b51.zip
FreeBSD-src-d2f14e461c5cffbdeeb5c7551c3ce498d4303b51.tar.gz
Fix verbose probe message.
PR: 29360
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ata/atapi-cd.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index c934cc6..02ff4b2 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -401,6 +401,12 @@ acd_describe(struct acd_softc *cdp)
else if (cdp->cap.eject)
printf("ejectable");
+ if (cdp->cap.lock)
+ printf(cdp->cap.locked ? ", locked" : ", unlocked");
+ if (cdp->cap.prevent)
+ printf(", lock protected");
+ printf("\n");
+
if (cdp->cap.mech != MST_MECH_CHANGER) {
ata_printf(cdp->atp->controller, cdp->atp->unit, "Medium: ");
switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
@@ -448,12 +454,8 @@ acd_describe(struct acd_softc *cdp)
printf("unknown (0x%x)", cdp->cap.medium_type); break;
}
}
+ printf("\n");
}
- if (cdp->cap.lock)
- printf(cdp->cap.locked ? ", locked" : ", unlocked");
- if (cdp->cap.prevent)
- printf(", lock protected");
- printf("\n");
}
else {
char chg[32];
@@ -1686,7 +1688,7 @@ acd_send_key(struct acd_softc *cdp, struct dvd_authinfo *ai)
case DVD_SEND_RPC:
length = 8;
- d.data[0] = ai.region;
+ d.data[0] = ai->region;
break;
default:
OpenPOWER on IntegriCloud