summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2017-02-26 09:49:40 +0000
committermartin <martin@NetBSD.org>2017-02-26 09:49:40 +0000
commite44adb7a38c9cd496bc252f80f1efbd422ccc378 (patch)
treef9e8aa9ee74baf3dc83bf188dbeb798dffc01a88 /sys/dev
parent678423b30c2bf6e5be2013319357569354179928 (diff)
Disks without a disk label happen in normal operation (both as USB
stick or with GPT), so do not cause an error message when opening them.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sun/disksubr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c
index 4bf719a3e5a..b88b28f8343 100644
--- a/sys/dev/sun/disksubr.c
+++ b/sys/dev/sun/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $ */
+/* $NetBSD: disksubr.c,v 1.15 2017/02/26 09:49:40 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.15 2017/02/26 09:49:40 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, stru
}
memset(clp->cd_block, 0, sizeof(clp->cd_block));
- return ("no disk label");
+ return NULL;
}
/*