summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorfvdl <fvdl@NetBSD.org>2003-01-07 18:35:04 +0000
committerfvdl <fvdl@NetBSD.org>2003-01-07 18:35:04 +0000
commit8db111aeb412d08ee62aa6508c88bb87c55cf2ca (patch)
tree4fc18124dd4b596487c07f96c322e0c92fbb1e06 /sys/dev/ata
parent17f2be3d4e5ca9627208c42e885eabc139be623c (diff)
Fix error in ODIOCGDINFO handling caused by previous change to it.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/wd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 3d40a9fb47c..ed33778af94 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.233 2002/12/15 01:56:02 fvdl Exp $ */
+/* $NetBSD: wd.c,v 1.234 2003/01/07 18:35:04 fvdl Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.233 2002/12/15 01:56:02 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.234 2003/01/07 18:35:04 fvdl Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
@@ -1034,8 +1034,9 @@ wdioctl(dev, xfer, addr, flag, p)
newlabel = malloc(sizeof *newlabel, M_TEMP, M_WAITOK);
if (newlabel == NULL)
return EIO;
+ *newlabel = *(wd->sc_dk.dk_label);
if (newlabel->d_npartitions <= OLDMAXPARTITIONS)
- memcpy(addr, &newlabel, sizeof (struct olddisklabel));
+ memcpy(addr, newlabel, sizeof (struct olddisklabel));
else
error = ENOTTY;
free(newlabel, M_TEMP);