summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2006-09-01 03:29:32 +0000
committermatt <matt@NetBSD.org>2006-09-01 03:29:32 +0000
commit49b2425f19b4bcd6690be0c7c56affe06771cc4d (patch)
tree4734ad0b9c4a4d8c5eb9b6ac7e508be9e82cd7f8 /sys/dev
parent013444d78cb25b32e23295e5c2a1bc674a6ff5e7 (diff)
Use an unsigned int for the blksize on read_cd_capacity.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/cd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 8cd3b799bbd..c74ca9193fc 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.247 2006/08/31 21:32:42 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.248 2006/09/01 03:29:32 matt Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.247 2006/08/31 21:32:42 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.248 2006/09/01 03:29:32 matt Exp $");
#include "rnd.h"
@@ -1645,7 +1645,7 @@ cdgetdisklabel(struct cd_softc *cd)
* we count.
*/
static int
-read_cd_capacity(struct scsipi_periph *periph, int *blksize, u_long *size)
+read_cd_capacity(struct scsipi_periph *periph, u_int *blksize, u_long *size)
{
struct scsipi_read_cd_capacity cap_cmd;
struct scsipi_read_cd_cap_data cap;
@@ -1728,7 +1728,7 @@ read_cd_capacity(struct scsipi_periph *periph, int *blksize, u_long *size)
static u_long
cd_size(struct cd_softc *cd, int flags)
{
- int blksize;
+ u_int blksize;
u_long size;
int error;