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

MFC r198520, r198857: fdc(4) module unload fixes

Browse Source 
PR:		kern/104079
Approved by:	trasz (mentor)
This commit is contained in:
Jaakko Heinonen 2009-12-23 11:35:25 +00:00
parent 27466e91ff
commit 48c7a87696
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/fdc/fdc.c
View File

@ -1734,6 +1734,10 @@ fdc_detach(device_t dev)
if ((error = bus_generic_detach(dev)))
return (error);
if (fdc->fdc_intr)
bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr);
fdc->fdc_intr = NULL;
/* kill worker thread */
mtx_lock(&fdc->fdc_mtx);
fdc->flags |= FDC_KTHREAD_EXIT;
@ -2031,15 +2035,22 @@ fd_attach(device_t dev)
return (0);
}
static void
fd_detach_geom(void *arg, int flag)
{
struct fd_data *fd = arg;
g_topology_assert();
g_wither_geom(fd->fd_geom, ENXIO);
}
static int
fd_detach(device_t dev)
{
struct fd_data *fd;
fd = device_get_softc(dev);
g_topology_lock();
g_wither_geom(fd->fd_geom, ENXIO);
g_topology_unlock();
g_waitfor_event(fd_detach_geom, fd, M_WAITOK, NULL);
while (device_get_state(dev) == DS_BUSY)
tsleep(fd, PZERO, "fdd", hz/10);
callout_drain(&fd->toffhandle);
@ -2068,8 +2079,7 @@ static int
fdc_modevent(module_t mod, int type, void *data)
{
g_modevent(NULL, type, &g_fd_class);
return (0);
return (g_modevent(NULL, type, &g_fd_class));
}
DRIVER_MODULE(fd, fdc, fd_driver, fd_devclass, fdc_modevent, 0);