diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:20 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:20 -0600 |
| commit | 95a6e48d776b208d085854358313346ebdb2924d (patch) | |
| tree | 4c048edc56274824dba302d5f271aa1d71fcfbd9 /hw/usb/dev-smartcard-reader.c | |
| parent | fb43a4807ec06307048018d93a7f9e0828308bb5 (diff) | |
| parent | 723aedd53281cfa0997457cb156a59909a75f5a8 (diff) | |
| download | qemu-95a6e48d776b208d085854358313346ebdb2924d.tar.gz | |
Merge remote-tracking branch 'kraxel/usb.72' into staging
* kraxel/usb.72:
usb-redir: Don't handle interrupt output packets async
usb-redir: Split usb_handle_interrupt_data into separate in/out functions
usb-smartcard-reader: Properly NAK interrupt eps when we've no events
usb-bt: Return NAK instead of STALL when interrupt ep has no data
uhci: Fix double unlink
uhci: Don't allow the guest to set port-enabled when there is no dev connected
uhci: Add a completions_only flag for async completions
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/dev-smartcard-reader.c')
| -rw-r--r-- | hw/usb/dev-smartcard-reader.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 190fcd62d4..de955b709f 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1002,6 +1002,8 @@ static void ccid_handle_data(USBDevice *dev, USBPacket *p) "handle_data: int_in: notify_slot_change %X, " "requested len %zd\n", s->bmSlotICCState, p->iov.size); + } else { + p->status = USB_RET_NAK; } break; default: |