From 0c90ad91a40579a1e29d0c0af42131a83d5d027d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 12 Apr 2013 09:58:45 -0700
Subject: [PATCH] --- yaml --- r: 364129 b: refs/heads/master c:
 dd671a39481eaf8ebd512ea8cba25d62066d078f h: refs/heads/master i:   364127:
 cacb10242cfd0a6eebefb73fe914a84b1a5b4f52 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/unioxx5.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4f3839d7b53d..74eaa33ba491 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53510352587c5350a8ae0c150a73244ce176ae40
+refs/heads/master: dd671a39481eaf8ebd512ea8cba25d62066d078f
diff --git a/trunk/drivers/staging/comedi/drivers/unioxx5.c b/trunk/drivers/staging/comedi/drivers/unioxx5.c
index 6661cf72cc1f..1b19cc246ab2 100644
--- a/trunk/drivers/staging/comedi/drivers/unioxx5.c
+++ b/trunk/drivers/staging/comedi/drivers/unioxx5.c
@@ -375,15 +375,15 @@ static int __unioxx5_subdev_init(struct comedi_device *dev,
 	int i, to, ndef_flag = 0;
 	int ret;
 
+	usp = kzalloc(sizeof(*usp), GFP_KERNEL);
+	if (usp == NULL)
+		return -ENOMEM;
+
 	ret = __comedi_request_region(dev, iobase, UNIOXX5_SIZE);
 	if (ret)
 		return ret;
 	usp->usp_iobase = iobase;
 
-	usp = kzalloc(sizeof(*usp), GFP_KERNEL);
-	if (usp == NULL)
-		return -ENOMEM;
-
 	/* defining modules types */
 	for (i = 0; i < 12; i++) {
 		to = 10000;