From 602f17b5a775f02e0e33a54d3155929dc00e4f53 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 7 Jan 2015 08:15:12 +0900
Subject: [PATCH] scd: fix merge failure.

* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
merge.

--

Thanks to Joshua Rogers for reviewing and reporting.
---
 scd/apdu.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scd/apdu.c b/scd/apdu.c
index 476723a38..4ec6b4d00 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2336,8 +2336,6 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
                      pin_verify, len, result, &resultlen);
   xfree (pin_verify);
   if (sw || resultlen < 2)
-    return sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE;
-  sw = (result[resultlen-2] << 8) | result[resultlen-1];
     {
       log_error ("control_pcsc failed: %d\n", sw);
       return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE;