diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-03 01:13:00 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-03 01:13:00 +0300 |
| commit | 9b326948c23908692d7dfe56ed149840d3829eaa (patch) | |
| tree | 515fefa7ce92f5bc1d68106f36c5bf4328194fd7 /drivers/firewire/core-cdev.c | |
| parent | ef2cc88e2a205b8a11a19e78db63a70d3728cdf5 (diff) | |
| parent | 7807759e4ad8d46347a5d52a0910269320b81e65 (diff) | |
| download | linux-9b326948c23908692d7dfe56ed149840d3829eaa.tar.xz | |
Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull FireWire updates from Stefan Richter:
- another y2038 fix
- janitorial code movement
* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: core: code cleanup after vm_map_pages_zero introduction
firewire: ohci: stop using get_seconds() for BUS_TIME
Diffstat (limited to 'drivers/firewire/core-cdev.c')
| -rw-r--r-- | drivers/firewire/core-cdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index c777088f5828..6e291d8f3a27 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1686,7 +1686,8 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma) if (ret < 0) goto fail; - ret = fw_iso_buffer_map_vma(&client->buffer, vma); + ret = vm_map_pages_zero(vma, client->buffer.pages, + client->buffer.page_count); if (ret < 0) goto fail; |