From 706f2f40589c57326892ac8f8aa2f000b622589e Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Tue, 26 Mar 2013 10:31:22 +0900
Subject: [PATCH] --- yaml --- r: 363173 b: refs/heads/master c:
 5ed0505c713805f89473cdc0bbfb5110dfd840cb h: refs/heads/master i:   363171:
 807bf8c89b08a58324c067da05da74bc404d5389 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/uio/uio.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 395cb29decad..330eeda64518 100644
--- 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
index c8b926291e28..b645c47501b4 100644
--- 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;