aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/csr.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-10-08 11:45:13 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 21:29:08 +0100
commitb63d4fe95f29b6cadffcee8cdabd8435e8560cde (patch)
treeea97227ea9805cd8255ec3ed2ba327ff50362403 /drivers/ieee1394/csr.c
parentda256c55373cbc45e30f868e0bddb81ddc4067bf (diff)
downloadkernel_samsung_smdk4412-b63d4fe95f29b6cadffcee8cdabd8435e8560cde.zip
kernel_samsung_smdk4412-b63d4fe95f29b6cadffcee8cdabd8435e8560cde.tar.gz
kernel_samsung_smdk4412-b63d4fe95f29b6cadffcee8cdabd8435e8560cde.tar.bz2
ieee1394: usecs_to_jiffies takes unsigned int argument
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
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);
}