diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-28 14:05:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-28 14:05:57 +0000 |
| commit | 87202721024a760fcb66024f848e7f22aea154ed (patch) | |
| tree | 6f68589240818c3e4c6bec484e4bfc61fed2b751 | |
| parent | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (diff) | |
| download | upstream-87202721024a760fcb66024f848e7f22aea154ed.tar.gz upstream-87202721024a760fcb66024f848e7f22aea154ed.tar.bz2 upstream-87202721024a760fcb66024f848e7f22aea154ed.zip | |
AA: iwinfo: merge r36471
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36472 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/iwinfo/Makefile | 2 | ||||
| -rw-r--r-- | 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 3758692450..e0090e0be5 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 b6760c3486..1a831f3ac1 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) |