diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-16 19:30:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-16 19:30:19 +0000 |
| commit | b383facb995ec4ca5ca50947abf8944665edf2b7 (patch) | |
| tree | 2537ab5e484d4d0b4b263911b4f365dee953927c /sys/scsi | |
| parent | 8de6676bad091487e4d5b1fff77c180985f95714 (diff) | |
another fix form csapuntz
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index d8f8a4443a6..2e1d9c225be 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.45 1999/10/14 05:23:02 deraadt Exp $ */ +/* $OpenBSD: cd.c,v 1.46 1999/10/16 19:30:18 deraadt Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -1227,6 +1227,7 @@ cdgetdisklabel(dev, cd, lp, clp, spoofonly) for (tocidx = hdr[TOC_HEADER_STARTING_TRACK]; tocidx <= hdr[TOC_HEADER_ENDING_TRACK]; tocidx++) { + is_data = ent[TOC_ENTRY_CONTROL_ADDR_TYPE] & 4; ent += TOC_ENTRY_SZ; nlba = ((cd->sc_link->quirks & ADEV_LITTLETOC) ? ent[TOC_ENTRY_MSF_LBA] | @@ -1237,7 +1238,6 @@ cdgetdisklabel(dev, cd, lp, clp, spoofonly) ent[TOC_ENTRY_MSF_LBA + 1] << 16 | ent[TOC_ENTRY_MSF_LBA + 2] << 8 | ent[TOC_ENTRY_MSF_LBA + 3]); - is_data = ent[TOC_ENTRY_CONTROL_ADDR_TYPE] & 4; lp->d_partitions[i].p_fstype = is_data ? FS_UNUSED : FS_OTHER; |