[PATCH] USB ATM: robustify poll throttling

No functional change, but less likely to break in the future.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 992db1c16838ae4c8e53d7cdf46eb2d2e302beca..03a0e99a426722c2f153e980ca2ffadedf1f868f 100644 (file)
--- a/drivers/usb/atm/speedtch.c
+++ b/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]);