From 76b711ec00f5283cb6e2660e7d62c123456e730c Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Thu, 23 Jun 2005 09:23:10 +0200 Subject: [PATCH] --- yaml --- r: 4609 b: refs/heads/master c: cd5c08fb7b0d960b7cd48bc977feee7b3bd8b046 h: refs/heads/master i: 4607: c5f1070f819c72aad2a902b7b9a141824c11c9e4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/atm/speedtch.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a836bef10e87..66325cc49ee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 322a95bc8eba889d2f9d7222936d682c9aad8294 +refs/heads/master: cd5c08fb7b0d960b7cd48bc977feee7b3bd8b046 diff --git a/trunk/drivers/usb/atm/speedtch.c b/trunk/drivers/usb/atm/speedtch.c index 992db1c16838..03a0e99a4267 100644 --- a/trunk/drivers/usb/atm/speedtch.c +++ b/trunk/drivers/usb/atm/speedtch.c @@ -430,13 +430,11 @@ static void speedtch_check_status(struct speedtch_instance_data *instance) ret = speedtch_read_status(instance); if (ret < 0) { atm_warn(usbatm, "error %d fetching device status\n", ret); - if (instance->poll_delay < MAX_POLL_DELAY) - instance->poll_delay *= 2; + instance->poll_delay = min(2 * instance->poll_delay, MAX_POLL_DELAY); return; } - if (instance->poll_delay > MIN_POLL_DELAY) - instance->poll_delay /= 2; + instance->poll_delay = max(instance->poll_delay / 2, MIN_POLL_DELAY); atm_dbg(usbatm, "%s: line state %02x\n", __func__, buf[OFFSET_7]);