]> err.no Git - linux-2.6/commitdiff
ieee1394: usecs_to_jiffies takes unsigned int argument
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 8 Oct 2006 09:45:13 +0000 (11:45 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Thu, 7 Dec 2006 20:29:08 +0000 (21:29 +0100)
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/ieee1394/csr.c

index ab0c80f61b9d184152d6ed2005cfae5f360e7835..52ac83e0ebee9bb510fd3b2a0051bffe2b1d0a25 100644 (file)
@@ -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);
 }