diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 12:58:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 12:58:06 +0100 |
| commit | be33f56c76e5d54d780b402f7777c92103e32419 (patch) | |
| tree | 25e06c65431552a5dbeba4ff237f48ea66c645d4 /hw/usb/dev-smartcard-reader.c | |
| parent | e4a9a7303a70397a89ea23072419976032de4ddc (diff) | |
| parent | 0d1e8d6f4a2ced75f673edfe4d6cb78f3b361144 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180618-pull-request' into staging
usb: revert ccid / qom patches.
# gpg: Signature made Mon 18 Jun 2018 10:21:11 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20180618-pull-request:
Revert "bus: do not unref the added child bus on realize"
Revert "usb: release the created buses"
Revert "usb-ccid: fix bus leak"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-smartcard-reader.c')
| -rw-r--r-- | hw/usb/dev-smartcard-reader.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index fa546fb3ce..13d0befd9c 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1147,7 +1147,6 @@ static void ccid_unrealize(USBDevice *dev, Error **errp) USBCCIDState *s = USB_CCID_DEV(dev); ccid_bulk_in_clear(s); - object_unref(OBJECT(&s->bus)); } static void ccid_flush_pending_answers(USBCCIDState *s) |