aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-07 15:38:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-07 15:38:23 -0800
commit68ae6b5cc1e8b88754a64140b88e467e02abfea2 (patch)
treef47d5a571b937f2d070855a267ea3bddacf75c98
parent08b8499bdd26822df16f962db88215d02e40850a (diff)
parentbc505f373979692d51a86d40925f77a8b09d17b9 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: set pci bus master enable bit
-rw-r--r--drivers/virtio/virtio_pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 1b657321699..625447f645d 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -649,6 +649,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
goto out_req_regions;
pci_set_drvdata(pci_dev, vp_dev);
+ pci_set_master(pci_dev);
/* we use the subsystem vendor/device id as the virtio vendor/device
* id. this allows us to use the same PCI vendor/device id for all