From 0f17f360a580cfde0a03c5d5b2a68befb7fd763e Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Thu, 24 Jun 1999 03:09:11 +0000 Subject: [PATCH] From the submitter: wfd driver code tries to give wd driver first crack at ioctl's, but incorrectly interprets internal error and never gets to send eject to ATAPI device. (this is fixed in the atapi-fd driver) PR: kern/12218 Submitted by: Simon Walton --- sys/i386/isa/wfd.c | 4 ++-- sys/pc98/pc98/wfd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c index d053cb8b4bf..3030b8634d0 100644 --- a/sys/i386/isa/wfd.c +++ b/sys/i386/isa/wfd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wfd.c,v 1.24 1999/05/30 16:52:30 phk Exp $ + * $Id: wfd.c,v 1.25 1999/05/31 11:26:38 phk Exp $ */ /* @@ -658,7 +658,7 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices, wfdstrategy1, (ds_setgeom_t *)NULL); - if (error != -1) + if (error != ENOIOCTL) return (error); if (t->flags & F_MEDIA_CHANGED) diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c index d053cb8b4bf..3030b8634d0 100644 --- a/sys/pc98/pc98/wfd.c +++ b/sys/pc98/pc98/wfd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wfd.c,v 1.24 1999/05/30 16:52:30 phk Exp $ + * $Id: wfd.c,v 1.25 1999/05/31 11:26:38 phk Exp $ */ /* @@ -658,7 +658,7 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices, wfdstrategy1, (ds_setgeom_t *)NULL); - if (error != -1) + if (error != ENOIOCTL) return (error); if (t->flags & F_MEDIA_CHANGED)