From 21b6c166ba7f05b535c8a9b038b5e8ef66ce806e Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 28 Apr 2013 14:05:57 +0000
Subject: [PATCH] AA: iwinfo: merge r36471

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36472 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/iwinfo/Makefile           | 2 +-
 package/iwinfo/src/iwinfo_utils.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/package/iwinfo/Makefile b/package/iwinfo/Makefile
index 3758692..e0090e0 100644
--- a/package/iwinfo/Makefile
+++ b/package/iwinfo/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=43
+PKG_RELEASE:=44
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
diff --git a/package/iwinfo/src/iwinfo_utils.c b/package/iwinfo/src/iwinfo_utils.c
index b6760c3..1a831f3 100644
--- a/package/iwinfo/src/iwinfo_utils.c
+++ b/package/iwinfo/src/iwinfo_utils.c
@@ -131,7 +131,7 @@ struct iwinfo_hardware_entry * iwinfo_hardware(struct iwinfo_hardware_id *id)
 {
 	FILE *db;
 	char buf[256] = { 0 };
-	static struct iwinfo_hardware_entry e;
+	static struct iwinfo_hardware_entry e, *rv = NULL;
 
 	if (!(db = fopen(IWINFO_HARDWARE_FILE, "r")))
 		return NULL;
@@ -161,15 +161,12 @@ struct iwinfo_hardware_entry * iwinfo_hardware(struct iwinfo_hardware_id *id)
 			(e.subsystem_device_id != id->subsystem_device_id))
 			continue;
 
+		rv = &e;
 		break;
 	}
 
 	fclose(db);
-
-	if (e.device_name[0])
-		return &e;
-
-	return NULL;
+	return rv;
 }
 
 int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
-- 
2.11.0