diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:49:45 -0400 |
| commit | a7b917256d8afacadc614414c4b0d411f76f3747 (patch) | |
| tree | 295558a19f52e4c507da57204cc6a86ba22708c6 /drivers/virtio/virtio_pci.c | |
| parent | dee70a32fa90cd05a5e34d03a48d549473569101 (diff) | |
| parent | b03214d559471359e2a85ae256686381d0672f29 (diff) | |
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6:
virtio-pci: disable msi at startup
virtio: return ENOMEM on out of memory
Diffstat (limited to 'drivers/virtio/virtio_pci.c')
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 95896f387927..ef8d9d558fc7 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -636,6 +636,9 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, | |||
| 636 | INIT_LIST_HEAD(&vp_dev->virtqueues); | 636 | INIT_LIST_HEAD(&vp_dev->virtqueues); |
| 637 | spin_lock_init(&vp_dev->lock); | 637 | spin_lock_init(&vp_dev->lock); |
| 638 | 638 | ||
| 639 | /* Disable MSI/MSIX to bring device to a known good state. */ | ||
| 640 | pci_msi_off(pci_dev); | ||
| 641 | |||
| 639 | /* enable the device */ | 642 | /* enable the device */ |
| 640 | err = pci_enable_device(pci_dev); | 643 | err = pci_enable_device(pci_dev); |
| 641 | if (err) | 644 | if (err) |