d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From the submitter:

Browse Source 
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 <simonw@cinesite.com>
This commit is contained in:
msmith 1999-06-24 03:09:11 +00:00
parent bab0ab8e6b
commit 779c9da976
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/isa/wfd.c
View File

@ -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)

4
sys/pc98/pc98/wfd.c
View File

@ -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)