yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[at24c] free perf counter if px4_at24c_initialize fails

Browse Source 
- add driver prefix to perf counter naming
This commit is contained in:
Daniel Agar
2021-07-03 11:03:14 -04:00
parent c9b5e488f5
commit 6dd0a58302
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platforms/nuttx/src/px4/common/px4_24xxxx_mtd.c
View File

@@ -567,9 +567,9 @@ FAR struct mtd_dev_s *px4_at24c_initialize(FAR struct i2c_master_s *dev,
priv->mtd.ioctl = at24c_ioctl; priv->mtd.ioctl = at24c_ioctl;
priv->dev = dev; priv->dev = dev;
priv->perf_transfers = perf_alloc(PC_ELAPSED, "eeprom_trans"); priv->perf_transfers = perf_alloc(PC_ELAPSED, "[at24c] eeprom transfer");
priv->perf_resets_retries = perf_alloc(PC_COUNT, "eeprom_rst"); priv->perf_resets_retries = perf_alloc(PC_COUNT, "[at24c] eeprom reset");
priv->perf_errors = perf_alloc(PC_COUNT, "eeprom_errs"); priv->perf_errors = perf_alloc(PC_COUNT, "[at24c] eeprom errors");
} }
/* attempt to read to validate device is present */ /* attempt to read to validate device is present */
@@ -600,6 +600,14 @@ FAR struct mtd_dev_s *px4_at24c_initialize(FAR struct i2c_master_s *dev,
perf_end(priv->perf_transfers); perf_end(priv->perf_transfers);
if (ret < 0) { if (ret < 0) {
perf_free(priv->perf_transfers);
perf_free(priv->perf_resets_retries);
perf_free(priv->perf_errors);
priv->perf_transfers = NULL;
priv->perf_resets_retries = NULL;
priv->perf_errors = NULL;
return NULL; return NULL;
} }