diff options
| author |   dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
| commit | 73d09fc56bd87109cdbe2d90369b3c6a93a5e94e (patch) | |
| tree | 489a1b920e2f327a4553184e9dddca9852de0863 /sys/dev/usb/usscanner.c | |
| parent | I just don't know why I decided to set block count to 512 unconditionaly (diff) | |
| download | wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.tar.xz wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.zip | |
give scsi controllers a real attach args to fill in when attaching scsibus.
ok miod@ marco@ deraadt@
Diffstat (limited to 'sys/dev/usb/usscanner.c')
| -rw-r--r-- | sys/dev/usb/usscanner.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index d669ee1d245..e588d4b2ed3 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.11 2006/06/23 06:27:12 miod Exp $ */ +/* $OpenBSD: usscanner.c,v 1.12 2006/11/28 23:59:45 dlg Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -204,6 +204,7 @@ USB_MATCH(usscanner) USB_ATTACH(usscanner) { USB_ATTACH_START(usscanner, sc, uaa); + struct scsibus_attach_args saa; usbd_device_handle dev = uaa->device; usbd_interface_handle iface; char *devinfop; @@ -364,7 +365,10 @@ USB_ATTACH(usscanner) sc->sc_link.scsipi_scsi.max_lun = 0; #endif - sc->sc_child = config_found(&sc->sc_dev, &sc->sc_link, scsiprint); + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + + sc->sc_child = config_found(&sc->sc_dev, &saa, scsiprint); usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, USBDEV(sc->sc_dev)); |