From 2fe37c7b292b772c71fed3ed82b9678062681bf6 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 8 Oct 2006 11:45:13 +0200 Subject: [PATCH] --- yaml --- r: 43426 b: refs/heads/master c: b63d4fe95f29b6cadffcee8cdabd8435e8560cde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/csr.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b40fcd27f8ed..d531c93f79c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da256c55373cbc45e30f868e0bddb81ddc4067bf +refs/heads/master: b63d4fe95f29b6cadffcee8cdabd8435e8560cde diff --git a/trunk/drivers/ieee1394/csr.c b/trunk/drivers/ieee1394/csr.c index ab0c80f61b9d..52ac83e0ebee 100644 --- a/trunk/drivers/ieee1394/csr.c +++ b/trunk/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); }