From 274d7b17a90908a90ba6ad295c08a79b287fc231 Mon Sep 17 00:00:00 2001
From: Joshua Rogers <git@internot.info>
Date: Sat, 24 Jan 2015 03:03:33 +1100
Subject: [PATCH] ccid: Remove incorrect expression leading to errors.

* scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
--

Variable 'rc' in send_escape_cmd was overwritten before it was
returned, leading to incorrect computation.

Signed-off-by: Joshua Rogers <git@internot.info>

[Log entry reformatted - wk]

(cherry picked from commit 3d9f8bf1dc0c7165a5d2a31568ed425d2dc3b91e)
---
 scd/ccid-driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 7a91e09c4..fdfe1f510 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2230,8 +2230,8 @@ send_escape_cmd (ccid_driver_t handle,
             {
               memcpy (result, msg, msglen);
               *resultlen = msglen;
+              rc = 0;
             }
-          rc = 0;
         }
         break;
       default: