[src/trunk]: src/sys/dev/ieee1394 don't call tsleep() with any mutexes hold

[cegger <cegger%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e3f11a235f6
branches:  trunk
changeset: 757350:8e3f11a235f6
user:      cegger <cegger%NetBSD.org@localhost>
date:      Thu Aug 26 12:48:19 2010 +0000

description:
don't call tsleep() with any mutexes hold

diffstat:

 sys/dev/ieee1394/fwdev.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r e38fd0996d4c -r 8e3f11a235f6 sys/dev/ieee1394/fwdev.c
--- a/sys/dev/ieee1394/fwdev.c  Thu Aug 26 10:23:24 2010 +0000
+++ b/sys/dev/ieee1394/fwdev.c  Thu Aug 26 12:48:19 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwdev.c,v 1.23 2010/08/16 06:05:07 cegger Exp $        */
+/*     $NetBSD: fwdev.c,v 1.24 2010/08/26 12:48:19 cegger Exp $        */
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
  * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.23 2010/08/16 06:05:07 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.24 2010/08/26 12:48:19 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -803,12 +803,18 @@
        int err = 0;
 
        mutex_enter(&d->fc->fc_mtx);
-       while ((xfer = STAILQ_FIRST(&d->rq)) == NULL && err == 0)
-               err = tsleep(&d->rq, FWPRI, "fwra", 0);
 
-       if (err != 0) {
-               mutex_exit(&d->fc->fc_mtx);
-               return err;
+       for (;;) {
+               xfer = STAILQ_FIRST(&d->rq);
+               if (xfer == NULL && err == 0) {
+                       mutex_exit(&d->fc->fc_mtx);
+                       err = tsleep(&d->rq, FWPRI, "fwra", 0);
+                       if (err != 0)
+                               return err;
+                       mutex_enter(&d->fc->fc_mtx);
+                       continue;
+               }
+               break;
        }
 
        STAILQ_REMOVE_HEAD(&d->rq, link);