From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 6 Oct 2009 23:15:55 +0000 (+0200)
Subject: Unbreak USB autoconnect filters
X-Git-Tag: v0.12.0-rc0~784
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05a91699292dbb814c37d55da72fd35fa2a686a2;p=thirdparty%2Fqemu.git

Unbreak USB autoconnect filters

Commit 22f84e73 added a qdev_init() missing on the path through
usb_host_device_open(), but that broke the path through
usb_host_auto_scan(), which already had one.  Remove that one.

Patchworks-ID: 35169
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/usb-linux.c b/usb-linux.c
index 2b7b09214e6..77cbf1ba6cc 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1396,8 +1396,6 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr,
         dprintf("husb: auto open: bus_num %d addr %d\n", bus_num, addr);
 
 	dev = usb_host_device_open_addr(bus_num, addr, product_name);
-	if (dev)
-            qdev_init(&dev->qdev);
     }
 
     return 0;