usb/113651: [patch] Fix build of ng_ubt(4) after recent USBDEV() cleanup

[Henrik Brix Andersen]

>Number:         113651
>Category:       usb
>Synopsis:       [patch] Fix build of ng_ubt(4) after recent USBDEV() cleanup
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-usb
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 13 11:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
pil.dk
>Environment:
System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #41: Wed Jun 6 16:22:53 CEST 2007 root at lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386


	
>Description:

Seems the USBDEV() macros used in ng_ubt.c was forgotten in the recent
USB stack overhaul.

	
>How-To-Repeat:
	
>Fix:

	

--- ng_ubt.c.diff begins here ---
--- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c.orig	Wed Jun 13 13:15:32 2007
+++ sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Jun 13 13:16:11 2007
@@ -747,8 +747,7 @@ USB_ATTACH(ubt)
 	for (i = 0; i < uaa->nifaces; i++)
 		uaa->ifaces[i] = NULL;
 
-	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
-		USBDEV(sc->sc_dev));
+	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
 
 	return 0;
 bad:
@@ -840,8 +839,7 @@ USB_DETACH(ubt)
 	NG_BT_MBUFQ_DRAIN(&sc->sc_aclq);
 	NG_BT_MBUFQ_DRAIN(&sc->sc_scoq);
 
-	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
-			USBDEV(sc->sc_dev));
+	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
 	return (0);
 } /* USB_DETACH(ubt) */
--- ng_ubt.c.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: