diff options
| author | Linus Torvalds | 2016-03-03 11:07:32 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-03 11:07:32 -0800 |
| commit | f4bd9822080ece335663245c8520b146d9e1bdad (patch) | |
| tree | 5718c3b84741c97b1aba4d777a9ef88f37a9a6fd /drivers/virtio | |
| parent | 52ad12966b0217a6dcf782cc2516061343911c0d (diff) | |
| parent | e1f33be9186363da7955bcb5f0b03e6685544c50 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull minor virtio/vhost fixes from Michael Tsirkin:
"This fixes two minor bugs: error handling in vhost, and capability
processing in virtio"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost: fix error path in vhost_init_used()
virtio-pci: read the right virtio_pci_notify_cap field
Diffstat (limited to 'drivers/virtio')
| -rw-r--r-- | drivers/virtio/virtio_pci_modern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index c0c11fad4611..7760fc1a2218 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -679,7 +679,7 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev) pci_read_config_dword(pci_dev, notify + offsetof(struct virtio_pci_notify_cap, - cap.length), + cap.offset), ¬ify_offset); /* We don't know how many VQs we'll map, ahead of the time. |