CVS commit: src/sys/dev/ieee1394

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Thu Aug 26 12:48:19 UTC 2010

Modified Files:
        src/sys/dev/ieee1394: fwdev.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ieee1394/fwdev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ieee1394/fwdev.c
diff -u src/sys/dev/ieee1394/fwdev.c:1.23 src/sys/dev/ieee1394/fwdev.c:1.24
--- src/sys/dev/ieee1394/fwdev.c:1.23	Mon Aug 16 06:05:07 2010
+++ src/sys/dev/ieee1394/fwdev.c	Thu Aug 26 12:48:19 2010
@@ -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);