From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 8 Oct 2006 09:45:13 +0000 (+0200)
Subject: ieee1394: usecs_to_jiffies takes unsigned int argument
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b63d4fe95f29b6cadffcee8cdabd8435e8560cde;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

ieee1394: usecs_to_jiffies takes unsigned int argument

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c
index ab0c80f61b9d..52ac83e0ebee 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);
 }