summaryrefslogtreecommitdiff
path: root/sys/dev/flash.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-06-01 00:07:49 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-06-01 00:07:49 +0000
commit50b189678902e9ab33471bd656c5e3a65520d9c3 (patch)
tree6a12648df155641161433115c6f6ae947b139b04 /sys/dev/flash.c
parentde25703b03d0b81b319602e0e00a300f49f80058 (diff)
Don't initialize d_partitions[RAW_DISK] just before calling
readdisklabel(), since all readdisklabel()'s do that already. ok deraadt@
Diffstat (limited to 'sys/dev/flash.c')
-rw-r--r--sys/dev/flash.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/flash.c b/sys/dev/flash.c
index ed46c3f6c00..403091b9d48 100644
--- a/sys/dev/flash.c
+++ b/sys/dev/flash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: flash.c,v 1.2 2007/02/15 00:53:26 krw Exp $ */
+/* $OpenBSD: flash.c,v 1.3 2007/06/01 00:07:48 krw Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -1001,12 +1001,6 @@ flashgetdefaultlabel(dev_t dev, struct flash_softc *sc,
lp->d_bbsize = BBSIZE;
lp->d_sbsize = SBSIZE;
- /* Fake the partition information. */
- lp->d_npartitions = RAW_PART + 1;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
-
/* Wrap it up. */
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;