summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-07-07 08:26:45 +0100
committerRusty Russell <rusty@rustcorp.com.au>2009-07-17 21:47:47 +0930
commit4b892e6582e3a4fe01f623aea386907270d5bf83 (patch)
tree82214468d537c8cf90b1fc0195bf33c688db3bfd
parentd9ecdea7ed7467db32ec160f4eca46c279255606 (diff)
downloadlinux-3.10-4b892e6582e3a4fe01f623aea386907270d5bf83.tar.gz
linux-3.10-4b892e6582e3a4fe01f623aea386907270d5bf83.tar.bz2
linux-3.10-4b892e6582e3a4fe01f623aea386907270d5bf83.zip
virtio-pci: correctly unregister root device on error
If pci_register_driver() fails we're incorrectly unregistering the root device with device_unregister() rather than root_device_unregister(). Reported-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--drivers/virtio/virtio_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 193c8f0e5cc..bcec78ffc76 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -669,7 +669,7 @@ static int __init virtio_pci_init(void)
err = pci_register_driver(&virtio_pci_driver);
if (err)
- device_unregister(virtio_pci_root);
+ root_device_unregister(virtio_pci_root);
return err;
}