Commit 6fdc068f1bdadfe5dca03426fe49bfe0f75fc104
2013-06-09T23:00:36
Revert "Give a generous timeout whenever we expect an OK message for working bflsc communications." This reverts commit 3d8cf60b96f908388f9d7ed7cf9d4dcade0dadf7.
diff --git a/driver-bflsc.c b/driver-bflsc.c
index 03f3a9b..b5a2450 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -497,8 +497,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo
{
char buf[BFLSC_BUFSIZ+1];
- *err = usb_read_ok_timeout(bflsc, buf, sizeof(buf)-1, amount,
- BFLSC_INFO_TIMEOUT, cmd);
+ *err = usb_read_nl(bflsc, buf, sizeof(buf)-1, amount, cmd);
if (*err < 0 || *amount < (int)BFLSC_OK_LEN)
return false;
else
@@ -507,8 +506,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo
static bool getokerr(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amount, char *buf, size_t bufsiz)
{
- *err = usb_read_ok_timeout(bflsc, buf, bufsiz-1, amount,
- BFLSC_INFO_TIMEOUT, cmd);
+ *err = usb_read_nl(bflsc, buf, bufsiz-1, amount, cmd);
if (*err < 0 || *amount < (int)BFLSC_OK_LEN)
return false;
else {
@@ -562,8 +560,7 @@ static bool bflsc_qres(struct cgpu_info *bflsc, char *buf, size_t bufsiz, int de
// of course all other I/O must also be failing ...
} else {
readok = true;
- *err = usb_read_ok_timeout(bflsc, buf, bufsiz-1, amount,
- BFLSC_INFO_TIMEOUT, C_GETRESULTS);
+ *err = usb_read_ok(bflsc, buf, bufsiz-1, amount, C_GETRESULTS);
mutex_unlock(&(bflsc->device_mutex));
if (*err < 0 || *amount < 1) {