summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Joshua Hill2010-05-13 07:06:45 -0400
committerGravatar Joshua Hill2010-05-13 07:06:45 -0400
commit5bbd277ce71521a3898697e4c8cb25ed65990f9c (patch)
treee786fc44f0be708c12ae85dc5ccf3227a5010135 /src
parenta2a3537ea24d3cdcc1b210b45695d6eed33ee433 (diff)
downloadlibirecovery-5bbd277ce71521a3898697e4c8cb25ed65990f9c.tar.gz
libirecovery-5bbd277ce71521a3898697e4c8cb25ed65990f9c.tar.bz2
Cleaned up irecv_reset(), and irecv_close() to make sure they were returning error if there really was an error
Diffstat (limited to 'src')
-rw-r--r--src/libirecovery.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/libirecovery.c b/src/libirecovery.c
index cdb0c53..a5b5c84 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -79,23 +79,21 @@ int irecv_open(irecv_device* device) {
}
int irecv_reset(irecv_device* device) {
- if (device != NULL) {
- if (device->handle != NULL) {
- libusb_reset_device(device->handle);
- }
+ if (device == NULL || device->handle != NULL) {
+ return IRECV_ERROR_NO_DEVICE;
}
+ libusb_reset_device(device->handle);
return IRECV_SUCCESS;
}
int irecv_close(irecv_device* device) {
- if (device != NULL) {
- if (device->handle != NULL) {
- libusb_close(device->handle);
- device->handle = NULL;
- }
+ if (device == NULL || device->handle != NULL) {
+ return IRECV_ERROR_NO_DEVICE;
}
+ libusb_close(device->handle);
+ device->handle = NULL;
return IRECV_SUCCESS;
}