diff options
| -rw-r--r-- | sys/arch/amd64/stand/efiboot/efidev.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/diskprobe.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/diskprobe.c | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/arch/amd64/stand/efiboot/efidev.c b/sys/arch/amd64/stand/efiboot/efidev.c index 8f85835cf45..2ec2f014723 100644 --- a/sys/arch/amd64/stand/efiboot/efidev.c +++ b/sys/arch/amd64/stand/efiboot/efidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efidev.c,v 1.28 2017/11/06 08:57:34 yasuoka Exp $ */ +/* $OpenBSD: efidev.c,v 1.29 2018/06/18 15:37:47 krw Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -497,10 +497,6 @@ efi_getdisklabel_cd9660(efi_diskinfo_t ed, struct disklabel *label) label->d_nsectors = 100; label->d_ncylinders = 1; label->d_secpercyl = label->d_ntracks * label->d_nsectors; - if (label->d_secpercyl == 0) { - label->d_secpercyl = 100; - /* as long as it's not 0, since readdisklabel divides by it */ - } strncpy(label->d_typename, "ATAPI CD-ROM", sizeof(label->d_typename)); label->d_type = DTYPE_ATAPI; diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c index 555141e1147..1d3351768fa 100644 --- a/sys/arch/amd64/stand/libsa/diskprobe.c +++ b/sys/arch/amd64/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.22 2017/12/18 12:53:33 fcambus Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.23 2018/06/18 15:37:48 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -344,10 +344,6 @@ cdprobe(void) dip->disklabel.d_ncylinders = 1; dip->disklabel.d_secpercyl = dip->disklabel.d_ntracks * dip->disklabel.d_nsectors; - if (dip->disklabel.d_secpercyl == 0) { - dip->disklabel.d_secpercyl = 100; - /* as long as it's not 0, since readdisklabel divides by it */ - } strncpy(dip->disklabel.d_typename, "ATAPI CD-ROM", sizeof(dip->disklabel.d_typename)); diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c index 0ec5fb17b5d..ea38de771f6 100644 --- a/sys/arch/i386/stand/libsa/diskprobe.c +++ b/sys/arch/i386/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.45 2017/12/18 12:53:33 fcambus Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.46 2018/06/18 15:37:48 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -331,10 +331,6 @@ cdprobe(void) dip->disklabel.d_ncylinders = 1; dip->disklabel.d_secpercyl = dip->disklabel.d_ntracks * dip->disklabel.d_nsectors; - if (dip->disklabel.d_secpercyl == 0) { - dip->disklabel.d_secpercyl = 100; - /* as long as it's not 0, since readdisklabel divides by it */ - } strncpy(dip->disklabel.d_typename, "ATAPI CD-ROM", sizeof(dip->disklabel.d_typename)); |