From 4e7aa3912be6d3a7da513a08ad1e59c5d1daa676 Mon Sep 17 00:00:00 2001
From: Peter Meerwald <pmeerw@pmeerw.net>
Date: Mon, 25 Jun 2012 23:13:25 +0200
Subject: [PATCH] --- yaml --- r: 317712 b: refs/heads/master c:
 a4d429e362d873414046c78724f3d6a7978bc2fd h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 .../drivers/staging/iio/Documentation/iio_utils.h | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 57515955aac7..d87d0cc44c7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 578f737dd36989121412cf947a5b534e7b8a0ac5
+refs/heads/master: a4d429e362d873414046c78724f3d6a7978bc2fd
diff --git a/trunk/drivers/staging/iio/Documentation/iio_utils.h b/trunk/drivers/staging/iio/Documentation/iio_utils.h
index ab788594b202..81a628975cdd 100644
--- a/trunk/drivers/staging/iio/Documentation/iio_utils.h
+++ b/trunk/drivers/staging/iio/Documentation/iio_utils.h
@@ -472,23 +472,30 @@ inline int find_type_by_name(const char *name, const char *type)
 						+ strlen(type)
 						+ numstrlen
 						+ 6);
-				if (filename == NULL)
+				if (filename == NULL) {
+					closedir(dp);
 					return -ENOMEM;
+				}
 				sprintf(filename, "%s%s%d/name",
 					iio_dir,
 					type,
 					number);
 				nameFile = fopen(filename, "r");
-				if (!nameFile)
+				if (!nameFile) {
+					free(filename);
 					continue;
+				}
 				free(filename);
 				fscanf(nameFile, "%s", thisname);
-				if (strcmp(name, thisname) == 0)
-					return number;
 				fclose(nameFile);
+				if (strcmp(name, thisname) == 0) {
+					closedir(dp);
+					return number;
+				}
 			}
 		}
 	}
+	closedir(dp);
 	return -ENODEV;
 }