summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-01 23:55:23 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-01 23:55:23 +0000
commitc866020577bb795d230818eaa3825eaed1bf0439 (patch)
tree1ab799d0feee54f56942036c11f54c2c5207109d /sys
parentbf419134e71a4b6bac975b40b31cc35ba9a1413f (diff)
make compile again
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/ciss.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 349a1e31fc5..bd7f2a4ba19 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciss.c,v 1.1 2005/07/06 01:52:13 mickey Exp $ */
+/* $OpenBSD: ciss.c,v 1.2 2005/08/01 23:55:22 mickey Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -898,22 +898,22 @@ ciss_scsi_ioctl(struct scsi_link *link, u_long cmd,
int
ciss_ioctl(struct device *dev, u_long cmd, caddr_t addr) /* TODO */
{
- struct ciss_softc *sc = (struct ciss_softc *)dev;
+ /* struct ciss_softc *sc = (struct ciss_softc *)dev; */
+ ciss_lock_t lock;
int error;
+ lock = CISS_LOCK(sc);
switch (cmd) {
- case BIOCPING:
- case BIOCCAPABILITIES:
+ case BIOCINQ:
+ case BIOCVOL:
+ case BIOCDISK:
case BIOCALARM:
- case BIOCBLINK:
- case BIOCSTARTSTOP:
- case BIOCSTATUS:
- case BIOCSCSICMD:
default:
CISS_DPRINTF(CISS_D_IOCTL, ("%s: invalid ioctl\n",
sc->sc_dev.dv_xname));
error = ENOTTY;
}
+ CISS_UNLOCK(sc, lock);
return error;
}