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

Commit 63bea350 authored by Jody McIntyre's avatar Jody McIntyre Committed by Linus Torvalds
Browse files

[PATCH] ieee1394: use time_before() 



Use of time_before() macro, defined at linux/jiffies.h, which deal with
wrapping correctly and are nicer to read.

Signed-off-by: default avatarMarcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarBen Collins <bcollins@debian.org>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJody McIntyre <scjody@steamballoon.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent db2fd664

drivers/ieee1394/hosts.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/timer.h>

#include <linux/jiffies.h>



#include "csr1212.h"

#include "ieee1394.h"
@@ -217,7 +218,7 @@ int hpsb_update_config_rom_image(struct hpsb_host *host) 


	/* IEEE 1394a-2000 prohibits using the same generation number

	 * twice in a 60 second period. */

	if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ)

	if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))

		/* Wait 60 seconds from the last time this generation number was

		 * used. */

		reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;