mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always return status from ftdi_open when called

Browse source 
Using dc_serial_open as a fallback to ftdi_open is just wrong, and will
never work, just mask the real error and introduce read herrings.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2018-09-16 13:55:37 +02:00 • committed by Dirk Hohndel
parent 4b42dcc6af
commit 1da9235cdf
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/libdivecomputer.c
View file

@ -1328,11 +1328,8 @@ dc_status_t divecomputer_device_open(device_data_t *data)
if (transports & DC_TRANSPORT_SERIAL) { if (transports & DC_TRANSPORT_SERIAL) {
#ifdef SERIAL_FTDI #ifdef SERIAL_FTDI
if (!strcmp(data->devname, "ftdi")) { if (!strcmp(data->devname, "ftdi"))
rc = ftdi_open(&data->iostream, context); return ftdi_open(&data->iostream, context);
if (rc == DC_STATUS_SUCCESS)
return rc;
}
#endif #endif
rc = dc_serial_open(&data->iostream, context, data->devname); rc = dc_serial_open(&data->iostream, context, data->devname);
if (rc == DC_STATUS_SUCCESS) if (rc == DC_STATUS_SUCCESS)