59c59
< __FBSDID("$FreeBSD: head/sys/dev/amr/amr.c 157585 2006-04-08 02:23:27Z ps $");
---
> __FBSDID("$FreeBSD: head/sys/dev/amr/amr.c 157586 2006-04-08 05:08:17Z scottl $");
386,388d385
<
< if (mtx_initialized(&sc->amr_wait_lock))
< mtx_destroy(&sc->amr_wait_lock);
604d600
< mtx_unlock(&sc->amr_list_lock);
617a614
> mtx_unlock(&sc->amr_list_lock);
658d654
< mtx_unlock(&sc->amr_list_lock);
668a665
> mtx_unlock(&sc->amr_list_lock);
815d811
< mtx_unlock(&sc->amr_list_lock);
866c862,864
< if ((error = amr_wait_command(ac)) != 0)
---
> error = amr_wait_command(ac);
> mtx_unlock(&sc->amr_list_lock);
> if (error)
1338d1335
< mtx_lock(&sc->amr_wait_lock);
1340c1337
< error = msleep(ac,&sc->amr_wait_lock, PRIBIO, "amrwcmd", 0);
---
> error = msleep(ac,&sc->amr_list_lock, PRIBIO, "amrwcmd", 0);
1342d1338
< mtx_unlock(&sc->amr_wait_lock);
2016,2021d2011
< } else if (ac->ac_flags & AMR_CMD_SLEEP) {
< mtx_lock(&sc->amr_wait_lock);
< /* unbusy the command */
< ac->ac_flags &= ~AMR_CMD_BUSY;
< mtx_unlock(&sc->amr_wait_lock);
< wakeup(ac);
2023c2013
< /* unbusy the command */
---
> mtx_lock(&sc->amr_list_lock);
2025c2015,2020
< }
---
> if (ac->ac_flags & AMR_CMD_SLEEP) {
> /* unbusy the command */
> wakeup(ac);
> }
> mtx_unlock(&sc->amr_list_lock);
> }