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
git-mirror · Mar 7, 2010 · 68ae6b5 · 68ae6b5
2 parents 08b8499 + bc505f3
commit 68ae6b5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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