summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/csr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394/csr.c')
-rw-r--r--drivers/ieee1394/csr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c
index ab0c80f..52ac83e 100644
--- a/drivers/ieee1394/csr.c
+++ b/drivers/ieee1394/csr.c
@@ -158,12 +158,10 @@ static void host_reset(struct hpsb_host *host)
*/
static inline void calculate_expire(struct csr_control *csr)
{
- unsigned long usecs =
- (csr->split_timeout_hi & 0x07) * USEC_PER_SEC +
- (csr->split_timeout_lo >> 19) * 125L;
-
- csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);
+ unsigned int usecs = (csr->split_timeout_hi & 7) * 1000000 +
+ (csr->split_timeout_lo >> 19) * 125;
+ csr->expire = usecs_to_jiffies(usecs > 100000 ? usecs : 100000);
HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
}
OpenPOWER on IntegriCloud