TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2016-03-25 08:52:25 -07:00
parent f98c2135f8 384fbb96f9
commit 3b3b3bd977
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firewire/nosy.c
View File

@@ -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);
} }