Changeset 90b0e28 in rtems
- Timestamp:
- 11/26/14 08:53:52 (9 years ago)
- Branches:
- 4.11, 5, master
- Children:
- fdd1e20
- Parents:
- d6f0ca64
- git-author:
- Sebastian Huber <sebastian.huber@…> (11/26/14 08:53:52)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (11/26/14 08:56:01)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/dev/i2c/i2c-dev.c
rd6f0ca64 r90b0e28 219 219 ) 220 220 { 221 int fd;222 221 int rv; 223 222 224 fd = open(bus_path, O_RDWR);225 if ( fd < 0) {223 dev->bus_fd = open(bus_path, O_RDWR); 224 if (dev->bus_fd < 0) { 226 225 (*destroy)(dev); 226 227 227 return -1; 228 228 } 229 229 230 rv = ioctl( fd, I2C_BUS_GET_CONTROL, &dev->bus);230 rv = ioctl(dev->bus_fd, I2C_BUS_GET_CONTROL, &dev->bus); 231 231 if (rv != 0) { 232 (void) close(fd);233 232 (*destroy)(dev); 233 234 234 return -1; 235 235 } … … 241 241 dev->get_block_size = i2c_dev_get_block_size_default; 242 242 dev->destroy = destroy; 243 dev->bus_fd = fd;244 243 dev->address = address; 245 244 … … 252 251 253 252 rv = close(dev->bus_fd); 254 _Assert( rv == 0);253 _Assert(dev->bus_fd < 0 || rv == 0); 255 254 (void) rv; 256 255 }
Note: See TracChangeset
for help on using the changeset viewer.