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

Commit 3b3b3bd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 

Pull firewire leftover from Stefan Richter:
 "Occurrences of timeval were supposed to be eliminated last round, now
  remove a last forgotten one"

* tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: nosy: Replace timeval with timespec64
parents f98c2135 384fbb96

drivers/firewire/nosy.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -446,14 +446,16 @@ static void 
bus_reset_irq_handler(struct pcilynx *lynx)

bus_reset_irq_handler(struct pcilynx *lynx)

{

{

	struct client *client;

	struct client *client;

	struct timeval tv;

	struct timespec64 ts64;

	u32    timestamp;





	do_gettimeofday(&tv);

	ktime_get_real_ts64(&ts64);

	timestamp = ts64.tv_nsec / NSEC_PER_USEC;





	spin_lock(&lynx->client_list_lock);

	spin_lock(&lynx->client_list_lock);





	list_for_each_entry(client, &lynx->client_list, link)

	list_for_each_entry(client, &lynx->client_list, link)

		packet_buffer_put(&client->buffer, &tv.tv_usec, 4);

		packet_buffer_put(&client->buffer, &timestamp, 4);





	spin_unlock(&lynx->client_list_lock);

	spin_unlock(&lynx->client_list_lock);

}

}