Commit b63d4fe9 authored by Stefan Richter's avatar Stefan Richter

ieee1394: usecs_to_jiffies takes unsigned int argument

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent da256c55
...@@ -158,12 +158,10 @@ static void host_reset(struct hpsb_host *host) ...@@ -158,12 +158,10 @@ static void host_reset(struct hpsb_host *host)
*/ */
static inline void calculate_expire(struct csr_control *csr) static inline void calculate_expire(struct csr_control *csr)
{ {
unsigned long usecs = unsigned int usecs = (csr->split_timeout_hi & 7) * 1000000 +
(csr->split_timeout_hi & 0x07) * USEC_PER_SEC + (csr->split_timeout_lo >> 19) * 125;
(csr->split_timeout_lo >> 19) * 125L;
csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);
csr->expire = usecs_to_jiffies(usecs > 100000 ? usecs : 100000);
HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ); HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment