system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-08 09:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay umass_cam_rescan by 200 ms to make sure attach is finished by the

Browse source 
time we tell CAM to rescan the bus. Together with the previous patch
this should avoid the problem where the devices would wedge because they
got spoken to over two different pipes.

Tested by:	Tomas Pluskal <plusik@pohoda.cz>
This commit is contained in:
Nick Hibma 2002-04-11 10:34:15 +00:00
parent 31c41f1b1e
commit b2f485ca0d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94423
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/dev/usb/umass.c
View file

@ -517,7 +517,7 @@ Static void umass_cam_quirk_cb (struct umass_softc *sc, void *priv,
Static void umass_cam_rescan_callback
(struct cam_periph *periph,union ccb *ccb);
Static void umass_cam_rescan (struct umass_softc *sc);
Static void umass_cam_rescan (void *addr);
Static int umass_cam_attach_sim (void);
Static int umass_cam_attach (struct umass_softc *sc);
@ -2097,8 +2097,13 @@ umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
}
Static void
umass_cam_rescan(struct umass_softc *sc)
umass_cam_rescan(void *addr)
{
/* Note: The sc is only passed in for debugging prints. If the device
* is disconnected before umass_cam_rescan has been able to run the
* driver might bomb.
*/
struct umass_softc *sc = (struct umass_softc *) addr;
struct cam_path *path;
union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, M_WAITOK);
@ -2155,7 +2160,11 @@ umass_cam_attach(struct umass_softc *sc)
* after booting has completed, when interrupts have been
* enabled.
*/
umass_cam_rescan(sc);
/* XXX This will bomb if the driver is unloaded between attach
* and execution of umass_cam_rescan.
*/
timeout(umass_cam_rescan, sc, MS_TO_TICKS(200));
}
return(0); /* always succesfull */