diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:38:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:38:23 -0500 |
| commit | 68ae6b5cc1e8b88754a64140b88e467e02abfea2 (patch) | |
| tree | f47d5a571b937f2d070855a267ea3bddacf75c98 /drivers/virtio/virtio_pci.c | |
| parent | 08b8499bdd26822df16f962db88215d02e40850a (diff) | |
| parent | bc505f373979692d51a86d40925f77a8b09d17b9 (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
Diffstat (limited to 'drivers/virtio/virtio_pci.c')
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 1b6573216998..625447f645d9 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, | |||
| 649 | goto out_req_regions; | 649 | goto out_req_regions; |
| 650 | 650 | ||
| 651 | pci_set_drvdata(pci_dev, vp_dev); | 651 | pci_set_drvdata(pci_dev, vp_dev); |
| 652 | pci_set_master(pci_dev); | ||
| 652 | 653 | ||
| 653 | /* we use the subsystem vendor/device id as the virtio vendor/device | 654 | /* we use the subsystem vendor/device id as the virtio vendor/device |
| 654 | * id. this allows us to use the same PCI vendor/device id for all | 655 | * id. this allows us to use the same PCI vendor/device id for all |