[src/netbsd-1-4]: src/sys/dev/scsipi pullup 1.22->1.23 (fvdl)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91c4598e12de
branches:  netbsd-1-4
changeset: 468662:91c4598e12de
user:      perry <perry%NetBSD.org@localhost>
date:      Wed May 05 22:39:04 1999 +0000

description:
pullup 1.22->1.23 (fvdl)

diffstat:

 sys/dev/scsipi/atapi_wdc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 03e3a3ab3f20 -r 91c4598e12de sys/dev/scsipi/atapi_wdc.c
--- a/sys/dev/scsipi/atapi_wdc.c        Wed May 05 21:00:50 1999 +0000
+++ b/sys/dev/scsipi/atapi_wdc.c        Wed May 05 22:39:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapi_wdc.c,v 1.20.2.1 1999/04/08 15:52:42 bouyer Exp $        */
+/*     $NetBSD: atapi_wdc.c,v 1.20.2.2 1999/05/05 22:39:04 perry Exp $ */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -620,6 +620,7 @@
                                sc_xfer->error = XS_SHORTSENSE;
                        }
                } else {
+                       sc_xfer->resid = xfer->c_bcount;
                        if (chp->ch_status & WDCS_ERR) {
                                /* save the short sense */
                                sc_xfer->error = XS_SHORTSENSE;
@@ -633,6 +634,7 @@
                                        xfer->databuf = &sc_xfer->sense;
                                        xfer->c_bcount =
                                            sizeof(sc_xfer->sense.scsi_sense);
+                                       xfer->c_skip = 0;
                                        xfer->c_flags |= C_SENSE;
                                        wdc_atapi_start(chp, xfer);
                                        return 1;
@@ -788,9 +790,7 @@
        WDCDEBUG_PRINT(("wdc_atapi_done %s:%d:%d: flags 0x%x\n",
            chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive,
            (u_int)xfer->c_flags), DEBUG_XFERS);
-       sc_xfer->resid = xfer->c_bcount;
        /* remove this command from xfer queue */
-       xfer->c_skip = 0;
        wdc_free_xfer(chp, xfer);
        sc_xfer->flags |= ITSDONE;
        if (drvp->n_dmaerrs ||