---

yaml --- r: 100279 b: refs/heads/master c: fbc8a81 h: refs/heads/master i: 100277: 726fd86 100275: 3f58ea0 100271: 42ae260 v: v3
git-mirror · Jun 20, 2008 · 6f12125 · 6f12125
1 parent aef3ee7
commit 6f12125
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2edbf8537edc62c9b0ef75e7025d01e8b6a48707
+refs/heads/master: fbc8a81d66bbbce3f0b4d5752f8bc8bb3c1fc439
diff --git a/trunk/drivers/uio/uio.c b/trunk/drivers/uio/uio.c
@@ -297,12 +297,17 @@ static int uio_open(struct inode *inode, struct file *filep)
 	struct uio_listener *listener;
 	int ret = 0;
 
+	lock_kernel();
 	idev = idr_find(&uio_idr, iminor(inode));
-	if (!idev)
-		return -ENODEV;
+	if (!idev) {
+		ret = -ENODEV;
+		goto out;
+	}
 
-	if (!try_module_get(idev->owner))
-		return -ENODEV;
+	if (!try_module_get(idev->owner)) {
+		ret = -ENODEV;
+		goto out;
+	}
 
 	listener = kmalloc(sizeof(*listener), GFP_KERNEL);
 	if (!listener) {
@@ -319,7 +324,7 @@ static int uio_open(struct inode *inode, struct file *filep)
 		if (ret)
 			goto err_infoopen;
 	}
-
+	unlock_kernel();
 	return 0;
 
 err_infoopen:
@@ -329,6 +334,8 @@ static int uio_open(struct inode *inode, struct file *filep)
 
 	module_put(idev->owner);
 
+out:
+	unlock_kernel();
 	return ret;
 }