Commit 68ae6b5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 08b8499b bc505f37

drivers/virtio/virtio_pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -649,6 +649,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, 
		goto out_req_regions;

		goto out_req_regions;





	pci_set_drvdata(pci_dev, vp_dev);

	pci_set_drvdata(pci_dev, vp_dev);

	pci_set_master(pci_dev);





	/* we use the subsystem vendor/device id as the virtio vendor/device

	/* 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

	 * id.  this allows us to use the same PCI vendor/device id for all