diff --git a/channels/smartcard/client/smartcard_operations.h b/channels/smartcard/client/smartcard_operations.h
index 2581c4afd..39add1811 100644
--- a/channels/smartcard/client/smartcard_operations.h
+++ b/channels/smartcard/client/smartcard_operations.h
@@ -112,7 +112,6 @@ typedef struct _longAndMultiString_Return
 
 typedef struct _longAndMultiString_Return ListReaders_Return;
 
-
 typedef struct _EstablishContext_Return
 {
 	LONG ReturnCode;
@@ -473,7 +472,6 @@ typedef struct _ReadCacheW_Call
 	/* [string] */ WCHAR* szLookupName;
 } ReadCacheW_Call;
 
-
 typedef struct _WriteCache_Common
 {
 	Handles_Call handles;
diff --git a/channels/smartcard/client/smartcard_pack.c b/channels/smartcard/client/smartcard_pack.c
index b819db377..71c78d215 100644
--- a/channels/smartcard/client/smartcard_pack.c
+++ b/channels/smartcard/client/smartcard_pack.c
@@ -3101,8 +3101,6 @@ LONG smartcard_pack_transmit_return(SMARTCARD_DEVICE* smartcard, wStream* s,
 	UINT32 cbRecvPci = ret->pioRecvPci ? ret->pioRecvPci->cbPciLength : 0;
 
 	smartcard_trace_transmit_return(smartcard, ret);
-	if (ret->ReturnCode != SCARD_S_SUCCESS)
-		return ret->ReturnCode;
 
 	if (!ret->pbRecvBuffer)
 		cbRecvLength = 0;
diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c
index c29079232..11e9a385c 100644
--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c
+++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c
@@ -2209,7 +2209,6 @@ static LONG WINAPI PCSC_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, LPC
 	}
 
 	return PCSC_MapErrorCodeToWinSCard(status);
-	;
 }
 
 static LONG WINAPI PCSC_SCardGetAttrib_Internal(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr,