---

yaml --- r: 363173 b: refs/heads/master c: 5ed0505 h: refs/heads/master i: 363171: 807bf8c v: v3
git-mirror · Mar 29, 2013 · 706f2f4 · 706f2f4
1 parent 194e174
commit 706f2f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f4f2302a11173d0ef84bbab4b887b9b50c31dc6
+refs/heads/master: 5ed0505c713805f89473cdc0bbfb5110dfd840cb
diff --git a/trunk/drivers/uio/uio.c b/trunk/drivers/uio/uio.c
@@ -374,6 +374,7 @@ static int uio_get_minor(struct uio_device *idev)
 	retval = idr_alloc(&uio_idr, idev, 0, UIO_MAX_DEVICES, GFP_KERNEL);
 	if (retval >= 0) {
 		idev->minor = retval;
+		retval = 0;
 	} else if (retval == -ENOSPC) {
 		dev_err(idev->dev, "too many uio devices\n");
 		retval = -EINVAL;