18389bf646
Fix crash in lsi_soft_reset (bz #1000947) Fix crash in scsi_dma_complete (bz #1001617) Fix initial /dev/kvm permissions (bz #993491)
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 4407e349fde5a3ab43a0cad130ec66e6a31c4471 Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Mon, 4 Mar 2013 18:45:49 +0200
|
|
Subject: [PATCH] dev-smartcard-reader: white space fixes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
|
|
(cherry picked from commit 4543d43c6181d90f86fb528430f250810dde03d5)
|
|
---
|
|
hw/usb/dev-smartcard-reader.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
|
|
index 979a473..24c84ce 100644
|
|
--- a/hw/usb/dev-smartcard-reader.c
|
|
+++ b/hw/usb/dev-smartcard-reader.c
|
|
@@ -471,6 +471,7 @@ static const USBDesc desc_ccid = {
|
|
static const uint8_t *ccid_card_get_atr(CCIDCardState *card, uint32_t *len)
|
|
{
|
|
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
|
|
+
|
|
if (cc->get_atr) {
|
|
return cc->get_atr(card, len);
|
|
}
|
|
@@ -482,6 +483,7 @@ static void ccid_card_apdu_from_guest(CCIDCardState *card,
|
|
uint32_t len)
|
|
{
|
|
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
|
|
+
|
|
if (cc->apdu_from_guest) {
|
|
cc->apdu_from_guest(card, apdu, len);
|
|
}
|
|
@@ -490,6 +492,7 @@ static void ccid_card_apdu_from_guest(CCIDCardState *card,
|
|
static int ccid_card_exitfn(CCIDCardState *card)
|
|
{
|
|
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
|
|
+
|
|
if (cc->exitfn) {
|
|
return cc->exitfn(card);
|
|
}
|
|
@@ -499,6 +502,7 @@ static int ccid_card_exitfn(CCIDCardState *card)
|
|
static int ccid_card_initfn(CCIDCardState *card)
|
|
{
|
|
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
|
|
+
|
|
if (cc->initfn) {
|
|
return cc->initfn(card);
|
|
}
|