Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b63d4fe9 authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: usecs_to_jiffies takes unsigned int argument 



Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent da256c55

drivers/ieee1394/csr.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

}