aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-05-30 16:09:42 -0400
committerRusty Russell <rusty@rustcorp.com.au>2008-05-30 01:09:42 -0400
commit5610bd1524332fe7d651eb56cc780e32763a2ac3 (patch)
tree551e8ea4cbbf087f3fe23f10eebb075466369228
parent2ad3cfbac58d0a6c6e65aafd9e0e757ca3d35292 (diff)
virtio: virtio_pci should not set bus_id.
The common virtio code sets the bus_id, overriding anything virtio_pci sets anyway. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Carsten Otte <cotte@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Chris Lalancette <clalance@redhat.com> Cc: Anthony Liguori <anthony@codemonkey.ws>
-rw-r--r--drivers/virtio/virtio_pci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 27e9fc9117cd..2913c2f309f0 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -325,7 +325,6 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
325 if (vp_dev == NULL) 325 if (vp_dev == NULL)
326 return -ENOMEM; 326 return -ENOMEM;
327 327
328 snprintf(vp_dev->vdev.dev.bus_id, BUS_ID_SIZE, "virtio%d", dev_index);
329 vp_dev->vdev.index = dev_index; 328 vp_dev->vdev.index = dev_index;
330 dev_index++; 329 dev_index++;
331 330