diff options
| author | Peter Maydell | 2018-05-18 13:58:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-18 13:58:39 +0200 |
| commit | dba0f15a3b3a2e72a526be665efad73f3c34a5dd (patch) | |
| tree | 7cc95ba19b2eb20ce8b9942e063f3776c6265da7 /hw/usb/ccid-card-passthru.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180518-pull-request' i... (diff) | |
| parent | hw/usb/dev-smartcard-reader: Handle 64 B USB packets (diff) | |
| download | qemu-dba0f15a3b3a2e72a526be665efad73f3c34a5dd.tar.gz qemu-dba0f15a3b3a2e72a526be665efad73f3c34a5dd.tar.xz qemu-dba0f15a3b3a2e72a526be665efad73f3c34a5dd.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180518-pull-request' into staging
usb: two smartcard reader fixes.
# gpg: Signature made Fri 18 May 2018 08:50:01 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-20180518-pull-request:
hw/usb/dev-smartcard-reader: Handle 64 B USB packets
ccid-card-passthru: fix regression in realize()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/ccid-card-passthru.c')
| -rw-r--r-- | hw/usb/ccid-card-passthru.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 7684db0cb3..25fb19b0d7 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -345,7 +345,7 @@ static void passthru_realize(CCIDCardState *base, Error **errp) card->vscard_in_pos = 0; card->vscard_in_hdr = 0; if (qemu_chr_fe_backend_connected(&card->cs)) { - error_setg(errp, "ccid-card-passthru: initing chardev"); + DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, ccid_card_vscard_read, |