diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-28 14:04:39 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-28 14:04:39 +0000 |
| commit | d75b5a818b14d62bc1c657c70b262c5280714a87 (patch) | |
| tree | 352b061a2a75606470ac0bf378a6de35e059678b | |
| parent | c9a389d384c05892b7b0a8b7b5d8dc949270f3e0 (diff) | |
iwinfo: fix iwinfo_hardware() return value if chip id is not found
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36471 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/utils/iwinfo/Makefile | 2 | ||||
| -rw-r--r-- | package/network/utils/iwinfo/src/iwinfo_utils.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 375869245..e0090e0be 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/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/network/utils/iwinfo/src/iwinfo_utils.c b/package/network/utils/iwinfo/src/iwinfo_utils.c index b6760c348..1a831f3ac 100644 --- a/package/network/utils/iwinfo/src/iwinfo_utils.c +++ b/package/network/utils/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) |