projects
/
contrib
/
mraa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f34a5c
)
intel_de3815: avoid double free in case of error
author
Brendan Le Foll
<brendan.le.foll@intel.com>
Wed, 8 Jul 2015 09:29:47 +0000
(10:29 +0100)
committer
Brendan Le Foll
<brendan.le.foll@intel.com>
Wed, 8 Jul 2015 09:34:32 +0000
(10:34 +0100)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
src/x86/intel_de3815.c
patch
|
blob
|
history
diff --git
a/src/x86/intel_de3815.c
b/src/x86/intel_de3815.c
index
5165cfd
..
f197bbc
100644
(file)
--- a/
src/x86/intel_de3815.c
+++ b/
src/x86/intel_de3815.c
@@
-161,13
+161,15
@@
mraa_intel_de3815()
b->i2c_bus[0].sda = 12;
b->i2c_bus[0].scl = 13;
- b->i2c_bus[1].bus_id = i
+
1;
+ b->i2c_bus[1].bus_id = i
+
1;
b->i2c_bus[1].sda = 14;
b->i2c_bus[1].scl = 15;
+ close(fd);
break;
}
} else {
syslog(LOG_ERR, "mraa: sysfs i2cdev failed");
+ close(fd);
break;
}
close(fd);
@@
-183,7
+185,6
@@
mraa_intel_de3815()
b->i2c_bus_count = 0;
b->def_i2c_bus = 0;
}
- close(fd);
b->spi_bus_count = 1;
b->def_spi_bus = 0;