[src/nathanw_sa]: src/sys/dev Fix merge botch.

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

details:   https://anonhg.NetBSD.org/src/rev/51591b47d367
branches:  nathanw_sa
changeset: 505526:51591b47d367
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Wed Jan 09 02:51:48 2002 +0000

description:
Fix merge botch.

diffstat:

 sys/dev/pci/twe.c  |  7 ++-----
 sys/dev/usb/ukbd.c |  7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r 387e22b758e7 -r 51591b47d367 sys/dev/pci/twe.c
--- a/sys/dev/pci/twe.c Wed Jan 09 02:51:22 2002 +0000
+++ b/sys/dev/pci/twe.c Wed Jan 09 02:51:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: twe.c,v 1.12.2.6 2001/11/14 19:15:31 nathanw Exp $     */
+/*     $NetBSD: twe.c,v 1.12.2.7 2002/01/09 02:51:48 nathanw Exp $     */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.12.2.6 2001/11/14 19:15:31 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.12.2.7 2002/01/09 02:51:48 nathanw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -922,9 +922,6 @@
            ccb->ccb_datasize, flags);
        bus_dmamap_unload(sc->sc_dmat, ccb->ccb_dmamap_xfer);
 
-       if (ccb->ccb_buf != NULL) {
-               tb = ccb->ccb_buf;
-
        if (ccb->ccb_abuf != (vaddr_t)0) {
                if ((ccb->ccb_flags & TWE_CCB_DATA_IN) != 0)
                        memcpy(ccb->ccb_data, (void *)ccb->ccb_abuf,
diff -r 387e22b758e7 -r 51591b47d367 sys/dev/usb/ukbd.c
--- a/sys/dev/usb/ukbd.c        Wed Jan 09 02:51:22 2002 +0000
+++ b/sys/dev/usb/ukbd.c        Wed Jan 09 02:51:48 2002 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ukbd.c,v 1.65.2.4 2002/01/08 00:32:11 nathanw Exp $        */
+/*      $NetBSD: ukbd.c,v 1.65.2.5 2002/01/09 02:52:03 nathanw Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.65.2.4 2002/01/08 00:32:11 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.65.2.5 2002/01/09 02:52:03 nathanw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -445,9 +445,6 @@
        if (sc->sc_hdev.sc_state & UHIDEV_OPEN)
                uhidev_close(&sc->sc_hdev);
 
-       usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
-                          USBDEV(sc->sc_dev));
-
        return (rv);
 }