d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep a handle on the startup rescan timer and cancel the timer if

Browse Source 
the device goes away.
This commit is contained in:
iedowse 2004-11-10 00:48:22 +00:00
parent 5bf0e6b98a
commit f834839bdf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb/umass.c
View File

@ -577,6 +577,7 @@ struct umass_softc {
unsigned char cam_scsi_command2[CAM_MAX_CDBLEN];
struct scsi_sense cam_scsi_sense;
struct scsi_sense cam_scsi_test_unit_ready;
usb_callout_t cam_scsi_rescan_ch;
int timeout; /* in msecs */
@ -874,6 +875,7 @@ USB_ATTACH(umass)
sc->iface = uaa->iface;
sc->ifaceno = uaa->ifaceno;
usb_callout_init(sc->cam_scsi_rescan_ch);
/* initialise the proto and drive values in the umass_softc (again) */
(void) umass_match_proto(sc, sc->iface, uaa->device);
@ -1121,6 +1123,7 @@ USB_DETACH(umass)
sc->flags |= UMASS_FLAGS_GONE;
usb_uncallout_drain(sc->cam_scsi_rescan_ch, umass_cam_rescan, sc);
if ((sc->proto & UMASS_PROTO_SCSI) ||
(sc->proto & UMASS_PROTO_ATAPI) ||
(sc->proto & UMASS_PROTO_UFI) ||
@ -2233,17 +2236,15 @@ umass_cam_attach(struct umass_softc *sc)
cam_sim_path(sc->umass_sim));
if (!cold) {
/* Notify CAM of the new device after 1 second delay. Any
/* Notify CAM of the new device after a short delay. Any
* failure is benign, as the user can still do it by hand
* (camcontrol rescan <busno>). Only do this if we are not
* booting, because CAM does a scan after booting has
* completed, when interrupts have been enabled.
*/
/* 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));
usb_callout(sc->cam_scsi_rescan_ch, MS_TO_TICKS(200),
umass_cam_rescan, sc);
}
return(0); /* always succesfull */